More work on DSTU2.1 structs

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

@@ -246,58 +246,58 @@ class ModelScanner {
 	private <T extends Annotation> T pullAnnotation(Class<?> theContainer, AnnotatedElement theTarget, Class<T> theAnnotationType) {
 
 		T retVal = theTarget.getAnnotation(theAnnotationType);
-		if (myContext.getVersion().getVersion() != FhirVersionEnum.DSTU2_HL7ORG) {
-			return retVal;
-		}
-
-		if (retVal == null) {
-			final Class<? extends Annotation> altAnnotationClass;
-			/*
-			 * Use a cache to minimize Class.forName calls, since they are slow and expensive..
-			 */
-			if (myAnnotationForwards.containsKey(theAnnotationType) == false) {
-				String sourceClassName = theAnnotationType.getName();
-				String candidateAltClassName = sourceClassName.replace("ca.uhn.fhir.model.api.annotation", "org.hl7.fhir.instance.model.annotations");
-				if (!sourceClassName.equals(candidateAltClassName)) {
-					Class<?> forName;
-					try {
-						forName = Class.forName(candidateAltClassName);
-						ourLog.debug("Forwarding annotation request for [{}] to class [{}]", theAnnotationType, forName);
-					} catch (ClassNotFoundException e) {
-						forName = null;
-					}
-					altAnnotationClass = (Class<? extends Annotation>) forName;
-				} else {
-					altAnnotationClass = null;
-				}
-				myAnnotationForwards.put(theAnnotationType, altAnnotationClass);
-			} else {
-				altAnnotationClass = myAnnotationForwards.get(theAnnotationType);
-			}
-
-			if (altAnnotationClass == null) {
-				return null;
-			}
-
-			final Annotation altAnnotation;
-			altAnnotation = theTarget.getAnnotation(altAnnotationClass);
-			if (altAnnotation == null) {
-				return null;
-			}
-
-			InvocationHandler h = new InvocationHandler() {
-
-				@Override
-				public Object invoke(Object theProxy, Method theMethod, Object[] theArgs) throws Throwable {
-					Method altMethod = altAnnotationClass.getMethod(theMethod.getName(), theMethod.getParameterTypes());
-					return altMethod.invoke(altAnnotation, theArgs);
-				}
-			};
-			retVal = (T) Proxy.newProxyInstance(theAnnotationType.getClassLoader(), new Class<?>[] { theAnnotationType }, h);
-
-		}
-
+//		if (myContext.getVersion().getVersion() != FhirVersionEnum.DSTU2_HL7ORG) {
 			return retVal;
+//		}
+//
+//		if (retVal == null) {
+//			final Class<? extends Annotation> altAnnotationClass;
+//			/*
+//			 * Use a cache to minimize Class.forName calls, since they are slow and expensive..
+//			 */
+//			if (myAnnotationForwards.containsKey(theAnnotationType) == false) {
+//				String sourceClassName = theAnnotationType.getName();
+//				String candidateAltClassName = sourceClassName.replace("ca.uhn.fhir.model.api.annotation", "org.hl7.fhir.instance.model.annotations");
+//				if (!sourceClassName.equals(candidateAltClassName)) {
+//					Class<?> forName;
+//					try {
+//						forName = Class.forName(candidateAltClassName);
+//						ourLog.debug("Forwarding annotation request for [{}] to class [{}]", theAnnotationType, forName);
+//					} catch (ClassNotFoundException e) {
+//						forName = null;
+//					}
+//					altAnnotationClass = (Class<? extends Annotation>) forName;
+//				} else {
+//					altAnnotationClass = null;
+//				}
+//				myAnnotationForwards.put(theAnnotationType, altAnnotationClass);
+//			} else {
+//				altAnnotationClass = myAnnotationForwards.get(theAnnotationType);
+//			}
+//
+//			if (altAnnotationClass == null) {
+//				return null;
+//			}
+//
+//			final Annotation altAnnotation;
+//			altAnnotation = theTarget.getAnnotation(altAnnotationClass);
+//			if (altAnnotation == null) {
+//				return null;
+//			}
+//
+//			InvocationHandler h = new InvocationHandler() {
+//
+//				@Override
+//				public Object invoke(Object theProxy, Method theMethod, Object[] theArgs) throws Throwable {
+//					Method altMethod = altAnnotationClass.getMethod(theMethod.getName(), theMethod.getParameterTypes());
+//					return altMethod.invoke(altAnnotation, theArgs);
+//				}
+//			};
+//			retVal = (T) Proxy.newProxyInstance(theAnnotationType.getClassLoader(), new Class<?>[] { theAnnotationType }, h);
+//
+//		}
+//
+//		return retVal;
 	}
 
 	private void scan(Class<? extends IBase> theClass) throws ConfigurationException {

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

@@ -74,7 +74,14 @@ public class RuntimePrimitiveDatatypeDefinition extends BaseRuntimeElementDefini
 		if (myProfileOfType != null) {
 			myProfileOf = theClassToElementDefinitions.get(myProfileOfType);
 			if (myProfileOf == null) {
-				throw new ConfigurationException("Unknown profileOf value: " + myProfileOfType + " in type " + getImplementingClass().getName());
+				StringBuilder b = new StringBuilder();
+				b.append("Unknown profileOf value: ");
+				b.append(myProfileOfType);
+				b.append(" in type ");
+				b.append(getImplementingClass().getName());
+				b.append(" - Valid types: ");
+				b.append(theClassToElementDefinitions.keySet());
+				throw new ConfigurationException(b.toString());
 			}
 		}
 	}

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

@@ -25,6 +25,7 @@ import java.util.Date;
 
 import org.hl7.fhir.instance.model.api.IBase;
 import org.hl7.fhir.instance.model.api.IBaseResource;
+import org.hl7.fhir.instance.model.api.IIdType;
 import org.hl7.fhir.instance.model.api.IPrimitiveType;
 
 import ca.uhn.fhir.context.FhirContext;
@@ -59,4 +60,6 @@ public interface IFhirVersion {
 
 	IPrimitiveType<Date> getLastUpdated(IBaseResource theResource);
 
+	IIdType newIdType();
+
 }

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

@@ -40,15 +40,6 @@ import ca.uhn.fhir.model.primitive.IdDt;
  * </p>
  */
 public interface IResource extends ICompositeElement, org.hl7.fhir.instance.model.api.IBaseResource {
-	/**
-	 * Include constant for <code>*</code> (return all includes)
-	 */
-	public static final Include INCLUDE_ALL = new Include("*", false).toLocked();
-
-	/**
-	 * Include set containing only {@link #INCLUDE_ALL}
-	 */
-	public static final Set<Include> WILDCARD_ALL_SET = Collections.unmodifiableSet(new HashSet<Include>(Arrays.asList(INCLUDE_ALL)));
 
 	/**
 	 * Returns the contained resource list for this resource.

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

@@ -675,4 +675,25 @@ public class IdDt extends UriDt implements IPrimitiveDatatype<String>, IIdType {
 		return theIdPart.toString();
 	}
 
+	@Override
+	public IIdType setParts(String theBaseUrl, String theResourceType, String theIdPart, String theVersionIdPart) {
+		if (isNotBlank(theVersionIdPart)) {
+			Validate.notBlank(theResourceType, "If theVersionIdPart is populated, theResourceType and theIdPart must be populated");
+			Validate.notBlank(theIdPart, "If theVersionIdPart is populated, theResourceType and theIdPart must be populated");
+		}
+		if (isNotBlank(theBaseUrl) && isNotBlank(theIdPart)) {
+			Validate.notBlank(theResourceType, "If theBaseUrl is populated and theIdPart is populated, theResourceType must be populated");
+		}
+		
+		setValue(null);
+		
+		myBaseUrl = theBaseUrl;
+		myResourceType = theResourceType;
+		myUnqualifiedId = theIdPart;
+		myUnqualifiedVersionId = StringUtils.defaultIfBlank(theVersionIdPart, null);
+		myHaveComponentParts = true;
+		
+		return this;
+	}
+
 }

hapi-fhir-base/src/main/java/ca/uhn/fhir/parser/JsonParser.java

@@ -531,7 +531,7 @@ public class JsonParser extends BaseParser implements IParser {
 			BaseRuntimeChildDefinition nextChild = nextChildElem.getDef();
 			if (nextChild instanceof RuntimeChildNarrativeDefinition) {
 				INarrativeGenerator gen = myContext.getNarrativeGenerator();
-				if (gen != null) {
+				if (gen != null && theResource instanceof IResource) {
 					BaseNarrativeDt<?> narr = ((IResource) theResource).getText();
 					if (narr.getDiv().isEmpty()) {
 						gen.generateNarrative(theResDef.getResourceProfile(), theResource, narr);

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

@@ -1798,7 +1798,7 @@ public class GenericClient extends BaseClient implements IGenericClient {
 				}
 			}
 
-			if (myReturnBundleType == null && myContext.getVersion().getVersion().equals(FhirVersionEnum.DSTU2_HL7ORG)) {
+			if (myReturnBundleType == null && myContext.getVersion().getVersion().isRi()) {
 				throw new IllegalArgumentException("When using the client with HL7.org structures, you must specify "
 						+ "the bundle return type for the client by adding \".returnBundle(org.hl7.fhir.instance.model.Bundle.class)\" to your search method call before the \".execute()\" method");
 			}

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/BaseOutcomeReturningMethodBinding.java

@@ -33,6 +33,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
 import org.hl7.fhir.instance.model.api.IBaseResource;
+import org.hl7.fhir.instance.model.api.IIdType;
 
 import ca.uhn.fhir.context.ConfigurationException;
 import ca.uhn.fhir.context.FhirContext;
@@ -267,12 +268,14 @@ abstract class BaseOutcomeReturningMethodBinding extends BaseMethodBinding<Metho
 		}
 	}
 
-	protected static void parseContentLocation(MethodOutcome theOutcomeToPopulate, String theResourceName, String theLocationHeader) {
+	protected static void parseContentLocation(FhirContext theContext, MethodOutcome theOutcomeToPopulate, String theResourceName, String theLocationHeader) {
 		if (StringUtils.isBlank(theLocationHeader)) {
 			return;
 		}
 
-		theOutcomeToPopulate.setId(new IdDt(theLocationHeader));
+		IIdType id = theContext.getVersion().newIdType();
+		id.setValue(theLocationHeader);
+		theOutcomeToPopulate.setId(id);
 
 		String resourceNamePart = "/" + theResourceName + "/";
 		int resourceIndex = theLocationHeader.lastIndexOf(resourceNamePart);

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/MethodUtil.java

@@ -732,7 +732,7 @@ public class MethodUtil {
 		MethodOutcome retVal = new MethodOutcome();
 		if (locationHeaders != null && locationHeaders.size() > 0) {
 			String locationHeader = locationHeaders.get(0);
-			BaseOutcomeReturningMethodBinding.parseContentLocation(retVal, theResourceName, locationHeader);
+			BaseOutcomeReturningMethodBinding.parseContentLocation(theContext, retVal, theResourceName, locationHeader);
 		}
 		if (theResponseStatusCode != Constants.STATUS_HTTP_204_NO_CONTENT) {
 			EncodingEnum ct = EncodingEnum.forContentType(theResponseMimeType);

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/OperationParameter.java

@@ -43,6 +43,7 @@ import ca.uhn.fhir.context.RuntimeChildPrimitiveDatatypeDefinition;
 import ca.uhn.fhir.context.RuntimePrimitiveDatatypeDefinition;
 import ca.uhn.fhir.context.RuntimeResourceDefinition;
 import ca.uhn.fhir.i18n.HapiLocalizer;
+import ca.uhn.fhir.model.api.IDatatype;
 import ca.uhn.fhir.rest.annotation.OperationParam;
 import ca.uhn.fhir.rest.api.RequestTypeEnum;
 import ca.uhn.fhir.rest.api.ValidationModeEnum;
@@ -66,7 +67,7 @@ public class OperationParameter implements IParameter {
 	private final String myOperationName;
 	private Class<?> myParameterType;
 	private String myParamType;
-	private FhirContext myContext;
+	private final FhirContext myContext;
 	private boolean myAllowGet;
 
 	public OperationParameter(FhirContext theCtx, String theOperationName, OperationParam theOperationParam) {
@@ -83,6 +84,10 @@ public class OperationParameter implements IParameter {
 
 
 
+	protected FhirContext getContext() {
+		return myContext;
+	}
+
 	public int getMax() {
 		return myMax;
 	}
@@ -102,6 +107,12 @@ public class OperationParameter implements IParameter {
 	@SuppressWarnings("unchecked")
 	@Override
 	public void initializeTypes(Method theMethod, Class<? extends Collection<?>> theOuterCollectionType, Class<? extends Collection<?>> theInnerCollectionType, Class<?> theParameterType) {
+		if (getContext().getVersion().getVersion().isRi()) {
+			if (IDatatype.class.isAssignableFrom(theParameterType)) {
+				throw new ConfigurationException("Incorrect use of type " + theParameterType.getSimpleName() + " as parameter type for method when context is for version " + getContext().getVersion().getVersion().name() + " in method: " + theMethod.toString());
+			}
+		}
+		
 		myParameterType = theParameterType;
 		if (theInnerCollectionType != null) {
 			myInnerCollectionType = CollectionBinder.getInstantiableCollectionType(theInnerCollectionType, myName);

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/RequestDetails.java

@@ -31,6 +31,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.hl7.fhir.instance.model.api.IIdType;
+
 import ca.uhn.fhir.model.primitive.IdDt;
 import ca.uhn.fhir.rest.api.RequestTypeEnum;
 import ca.uhn.fhir.rest.api.RestOperationTypeEnum;
@@ -43,7 +45,7 @@ public abstract class RequestDetails {
 	private String myCompartmentName;
 	private String myCompleteUrl;
 	private String myFhirServerBase;
-	private IdDt myId;
+	private IIdType myId;
 	private String myOperation;
 	private Map<String, String[]> myParameters;
 	private String myRequestPath;
@@ -72,7 +74,7 @@ public abstract class RequestDetails {
 		return myFhirServerBase;
 	}
 
-	public IdDt getId() {
+	public IIdType getId() {
 		return myId;
 	}
 
@@ -132,7 +134,7 @@ public abstract class RequestDetails {
 		myFhirServerBase = theFhirServerBase;
 	}
 
-	public void setId(IdDt theId) {
+	public void setId(IIdType theId) {
 		myId = theId;
 	}
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/UpdateMethodBinding.java

@@ -1,6 +1,5 @@
 package ca.uhn.fhir.rest.method;
 
-import static org.apache.commons.lang3.StringUtils.isBlank;
 /*
  * #%L
  * HAPI FHIR - Core Library
@@ -26,6 +25,8 @@ import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.Set;
 
+import org.hl7.fhir.instance.model.api.IIdType;
+
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.model.api.IResource;
 import ca.uhn.fhir.model.primitive.IdDt;
@@ -59,9 +60,9 @@ public class UpdateMethodBinding extends BaseOutcomeReturningMethodBindingWithRe
 		 * Content-Location header, but we allow it in the PUT URL as well..
 		 */
 		String locationHeader = theRequest.getHeader(Constants.HEADER_CONTENT_LOCATION);
-		IdDt id = theRequest.getId();
+		IIdType id = theRequest.getId();
 		if (isNotBlank(locationHeader)) {
-			id = new IdDt(locationHeader);
+			id.setValue(locationHeader);
 			if (isNotBlank(id.getResourceType())) {
 				if (!getResourceName().equals(id.getResourceType())) {
 					throw new InvalidRequestException("Attempting to update '" + getResourceName() + "' but content-location header specifies different resource type '" + id.getResourceType() + "' - header value: " + locationHeader);
@@ -85,7 +86,7 @@ public class UpdateMethodBinding extends BaseOutcomeReturningMethodBindingWithRe
 
 		if (isNotBlank(locationHeader)) {
 			MethodOutcome mo = new MethodOutcome();
-			parseContentLocation(mo, getResourceName(), locationHeader);
+			parseContentLocation(getContext(), mo, getResourceName(), locationHeader);
 			if (mo.getId() == null || mo.getId().isEmpty()) {
 				throw new InvalidRequestException("Invalid Content-Location header for resource " + getResourceName() + ": " + locationHeader);
 			}

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

@@ -50,12 +50,12 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 import org.hl7.fhir.instance.model.api.IBaseResource;
+import org.hl7.fhir.instance.model.api.IIdType;
 
 import ca.uhn.fhir.context.ConfigurationException;
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.context.ProvidedResourceScanner;
 import ca.uhn.fhir.context.RuntimeResourceDefinition;
-import ca.uhn.fhir.model.primitive.IdDt;
 import ca.uhn.fhir.parser.IParser;
 import ca.uhn.fhir.rest.annotation.Destroy;
 import ca.uhn.fhir.rest.annotation.IdParam;
@@ -64,7 +64,6 @@ import ca.uhn.fhir.rest.api.MethodOutcome;
 import ca.uhn.fhir.rest.api.RequestTypeEnum;
 import ca.uhn.fhir.rest.method.BaseMethodBinding;
 import ca.uhn.fhir.rest.method.ConformanceMethodBinding;
-import ca.uhn.fhir.rest.method.PageMethodBinding;
 import ca.uhn.fhir.rest.method.ParseAction;
 import ca.uhn.fhir.rest.method.RequestDetails;
 import ca.uhn.fhir.rest.server.exceptions.AuthenticationException;
@@ -565,13 +564,14 @@ public class RestfulServer extends HttpServlet implements IRestfulServer<Servlet
 			Map<String, String[]> params = new HashMap<String, String[]>(theRequest.getParameterMap());
 			requestDetails.setParameters(params);
 
-			IdDt id;
+			IIdType id;
 			populateRequestDetailsFromRequestPath(requestDetails, requestPath);
 
 			if (theRequestType == RequestTypeEnum.PUT) {
 				String contentLocation = theRequest.getHeader(Constants.HEADER_CONTENT_LOCATION);
 				if (contentLocation != null) {
-					id = new IdDt(contentLocation);
+					id = myFhirContext.getVersion().newIdType();
+					id.setValue(contentLocation);
 					requestDetails.setId(id);
 				}
 			}
@@ -876,7 +876,7 @@ public class RestfulServer extends HttpServlet implements IRestfulServer<Servlet
 		StringTokenizer tok = new StringTokenizer(theRequestPath, "/");
 		String resourceName = null;
 
-		IdDt id = null;
+		IIdType id = null;
 		String operation = null;
 		String compartment = null;
 		if (tok.hasMoreTokens()) {
@@ -893,7 +893,8 @@ public class RestfulServer extends HttpServlet implements IRestfulServer<Servlet
 			if (partIsOperation(nextString)) {
 				operation = nextString;
 			} else {
-				id = new IdDt(resourceName, UrlUtil.unescape(nextString));
+				id = myFhirContext.getVersion().newIdType();
+				id.setParts(null, resourceName, UrlUtil.unescape(nextString), null);
 			}
 		}
 
@@ -905,7 +906,7 @@ public class RestfulServer extends HttpServlet implements IRestfulServer<Servlet
 					if (id == null) {
 						throw new InvalidRequestException("Don't know how to handle request path: " + theRequestPath);
 					}
-					id = new IdDt(resourceName, id.getIdPart(), UrlUtil.unescape(versionString));
+					id.setParts(null, resourceName, id.getIdPart(), UrlUtil.unescape(versionString));
 				} else {
 					operation = Constants.PARAM_HISTORY;
 				}

hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseBackboneElement.java

@@ -1,5 +1,7 @@
 package org.hl7.fhir.instance.model.api;
 
+import ca.uhn.fhir.model.api.IElement;
+
 /*
  * #%L
  * HAPI FHIR - Core Library
@@ -21,6 +23,6 @@ package org.hl7.fhir.instance.model.api;
  */
 
 
-public interface IBaseBackboneElement extends IBase, IBaseHasExtensions, IBaseHasModifierExtensions {
+public interface IBaseBackboneElement extends IElement, IBaseHasExtensions, IBaseHasModifierExtensions {
 
 }

hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseDatatype.java

@@ -1,5 +1,7 @@
 package org.hl7.fhir.instance.model.api;
 
+import ca.uhn.fhir.model.api.IElement;
+
 /*
  * #%L
  * HAPI FHIR - Core Library
@@ -21,6 +23,6 @@ package org.hl7.fhir.instance.model.api;
  */
 
 
-public interface IBaseDatatype extends IBase {
+public interface IBaseDatatype extends IElement {
 
 }

hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseResource.java

@@ -1,7 +1,13 @@
 package org.hl7.fhir.instance.model.api;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
 import ca.uhn.fhir.context.FhirVersionEnum;
 import ca.uhn.fhir.model.api.IElement;
+import ca.uhn.fhir.model.api.Include;
 
 /*
  * #%L
@@ -33,6 +39,16 @@ import ca.uhn.fhir.model.api.IElement;
  */
 public interface IBaseResource extends IBase, IElement {
 
+	/**
+	 * Include constant for <code>*</code> (return all includes)
+	 */
+	public static final Include INCLUDE_ALL = new Include("*", false).toLocked();
+
+	/**
+	 * Include set containing only {@link #INCLUDE_ALL}
+	 */
+	public static final Set<Include> WILDCARD_ALL_SET = Collections.unmodifiableSet(new HashSet<Include>(Arrays.asList(INCLUDE_ALL)));
+
 	IIdType getIdElement();
 	
 	IBaseResource setId(String theId);

hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IIdType.java

@@ -135,4 +135,20 @@ public interface IIdType {
 
 	IIdType withVersion(String theVersion);
 
+	/**
+	 * Sets the value of this ID by combining all of the individual parts.
+	 * <p>
+	 * <b>Required parameters:</b> The following rules apply to the parameters of this method (in this case, populated means
+	 * a non-empty string and not populated means <code>null</code> or an empty string)
+	 * </p>
+	 * <ul>
+	 * <li>All values may be not populated</li>
+	 * <li>If <b>theVersionIdPart</b> is populated, <b>theResourceType</b> and <b>theIdPart</b> must be populated</li>
+	 * <li>If <b>theBaseUrl</b> is populated and <b>theIdPart</b> is populated, <b>theResourceType</b> must be populated</li>
+	 * </ul>
+	 * 
+	 * @return Returns a reference to <code>this</code> for easy method chaining
+	 */
+	IIdType setParts(String theBaseUrl, String theResourceType, String theIdPart, String theVersionIdPart);
+
 }

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java

@@ -54,6 +54,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.utils.URLEncodedUtils;
 import org.hl7.fhir.dstu21.model.IdType;
+import org.hl7.fhir.dstu21.model.StringType;
 import org.hl7.fhir.dstu21.model.Bundle.HTTPVerb;
 import org.hl7.fhir.instance.model.api.IAnyResource;
 import org.hl7.fhir.instance.model.api.IBaseCoding;
@@ -1272,9 +1273,15 @@ public abstract class BaseHapiFhirDao<T extends IBaseResource> implements IDao {
 			}
 		}
 
+		res.getMeta().getTag().clear();
+		res.getMeta().getProfile().clear();
+		res.getMeta().getSecurity().clear();
+		res.getMeta().setLastUpdated(null);
+		res.getMeta().setVersionId(null);
+		
 		populateResourceId(res, theEntity);
 
-		res.getMeta().setLastUpdated(theEntity.getUpdated().getValue());
+		res.getMeta().setLastUpdated(theEntity.getUpdatedDate());
 		IDao.RESOURCE_PID.put(res, theEntity.getId());
 
 		Collection<? extends BaseTag> tags = theEntity.getTags();
@@ -1726,7 +1733,7 @@ public abstract class BaseHapiFhirDao<T extends IBaseResource> implements IDao {
 		List<IPrimitiveType> childElements = getContext().newTerser().getAllPopulatedChildElementsOfType(theResource, IPrimitiveType.class);
 		for (@SuppressWarnings("rawtypes")
 		IPrimitiveType nextType : childElements) {
-			if (nextType instanceof StringDt) {
+			if (nextType instanceof StringDt || nextType.getClass().equals(StringType.class)) {
 				String nextValue = nextType.getValueAsString();
 				if (isNotBlank(nextValue)) {
 					retVal.append(nextValue.replace("\n", " ").replace("\r", " "));

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoEncounterDstu2.java

@@ -24,11 +24,12 @@ import java.util.Collections;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.hl7.fhir.instance.model.api.IIdType;
+import org.hl7.fhir.instance.model.api.IPrimitiveType;
+
 import ca.uhn.fhir.jpa.dao.SearchParameterMap.EverythingModeEnum;
 import ca.uhn.fhir.model.api.IResource;
 import ca.uhn.fhir.model.dstu2.resource.Encounter;
-import ca.uhn.fhir.model.primitive.IdDt;
-import ca.uhn.fhir.model.primitive.UnsignedIntDt;
 import ca.uhn.fhir.rest.api.SortSpec;
 import ca.uhn.fhir.rest.param.DateRangeParam;
 import ca.uhn.fhir.rest.param.StringParam;
@@ -37,7 +38,7 @@ import ca.uhn.fhir.rest.server.IBundleProvider;
 public class FhirResourceDaoEncounterDstu2 extends FhirResourceDaoDstu2<Encounter>implements IFhirResourceDaoEncounter<Encounter> {
 
 	@Override
-	public IBundleProvider encounterInstanceEverything(HttpServletRequest theServletRequest, IdDt theId, UnsignedIntDt theCount, DateRangeParam theLastUpdated, SortSpec theSort) {
+	public IBundleProvider encounterInstanceEverything(HttpServletRequest theServletRequest, IIdType theId, IPrimitiveType<Integer> theCount, DateRangeParam theLastUpdated, SortSpec theSort) {
 		SearchParameterMap paramMap = new SearchParameterMap();
 		if (theCount != null) {
 			paramMap.setCount(theCount.getValue());
@@ -56,7 +57,7 @@ public class FhirResourceDaoEncounterDstu2 extends FhirResourceDaoDstu2<Encounte
 	}
 
 	@Override
-	public IBundleProvider encounterTypeEverything(HttpServletRequest theServletRequest, UnsignedIntDt theCount, DateRangeParam theLastUpdated, SortSpec theSort) {
+	public IBundleProvider encounterTypeEverything(HttpServletRequest theServletRequest, IPrimitiveType<Integer> theCount, DateRangeParam theLastUpdated, SortSpec theSort) {
 		return encounterInstanceEverything(theServletRequest, null, theCount, theLastUpdated, theSort);
 	}
 

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoEncounterDstu21.java

@@ -25,11 +25,11 @@ import java.util.Collections;
 import javax.servlet.http.HttpServletRequest;
 
 import org.hl7.fhir.dstu21.model.Encounter;
+import org.hl7.fhir.instance.model.api.IIdType;
+import org.hl7.fhir.instance.model.api.IPrimitiveType;
 
 import ca.uhn.fhir.jpa.dao.SearchParameterMap.EverythingModeEnum;
 import ca.uhn.fhir.model.api.IResource;
-import ca.uhn.fhir.model.primitive.IdDt;
-import ca.uhn.fhir.model.primitive.UnsignedIntDt;
 import ca.uhn.fhir.rest.api.SortSpec;
 import ca.uhn.fhir.rest.param.DateRangeParam;
 import ca.uhn.fhir.rest.param.StringParam;
@@ -38,7 +38,7 @@ import ca.uhn.fhir.rest.server.IBundleProvider;
 public class FhirResourceDaoEncounterDstu21 extends FhirResourceDaoDstu21<Encounter>implements IFhirResourceDaoEncounter<Encounter> {
 
 	@Override
-	public IBundleProvider encounterInstanceEverything(HttpServletRequest theServletRequest, IdDt theId, UnsignedIntDt theCount, DateRangeParam theLastUpdated, SortSpec theSort) {
+	public IBundleProvider encounterInstanceEverything(HttpServletRequest theServletRequest, IIdType theId, IPrimitiveType<Integer> theCount, DateRangeParam theLastUpdated, SortSpec theSort) {
 		SearchParameterMap paramMap = new SearchParameterMap();
 		if (theCount != null) {
 			paramMap.setCount(theCount.getValue());
@@ -57,7 +57,7 @@ public class FhirResourceDaoEncounterDstu21 extends FhirResourceDaoDstu21<Encoun
 	}
 
 	@Override
-	public IBundleProvider encounterTypeEverything(HttpServletRequest theServletRequest, UnsignedIntDt theCount, DateRangeParam theLastUpdated, SortSpec theSort) {
+	public IBundleProvider encounterTypeEverything(HttpServletRequest theServletRequest, IPrimitiveType<Integer> theCount, DateRangeParam theLastUpdated, SortSpec theSort) {
 		return encounterInstanceEverything(theServletRequest, null, theCount, theLastUpdated, theSort);
 	}
 

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoPatientDstu2.java

@@ -25,11 +25,11 @@ import java.util.Collections;
 import javax.servlet.http.HttpServletRequest;
 
 import org.hl7.fhir.instance.model.api.IIdType;
+import org.hl7.fhir.instance.model.api.IPrimitiveType;
 
 import ca.uhn.fhir.jpa.dao.SearchParameterMap.EverythingModeEnum;
 import ca.uhn.fhir.model.api.IResource;
 import ca.uhn.fhir.model.dstu2.resource.Patient;
-import ca.uhn.fhir.model.primitive.UnsignedIntDt;
 import ca.uhn.fhir.rest.api.RestOperationTypeEnum;
 import ca.uhn.fhir.rest.api.SortSpec;
 import ca.uhn.fhir.rest.param.DateRangeParam;
@@ -41,7 +41,7 @@ import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor.ActionRequestDetai
 
 public class FhirResourceDaoPatientDstu2 extends FhirResourceDaoDstu2<Patient>implements IFhirResourceDaoPatient<Patient> {
 
-	private IBundleProvider doEverythingOperation(IIdType theId, UnsignedIntDt theCount, DateRangeParam theLastUpdated, SortSpec theSort, StringAndListParam theContent, StringAndListParam theNarrative) {
+	private IBundleProvider doEverythingOperation(IIdType theId, IPrimitiveType<Integer> theCount, DateRangeParam theLastUpdated, SortSpec theSort, StringAndListParam theContent, StringAndListParam theNarrative) {
 		SearchParameterMap paramMap = new SearchParameterMap();
 		if (theCount != null) {
 			paramMap.setCount(theCount.getValue());
@@ -66,7 +66,7 @@ public class FhirResourceDaoPatientDstu2 extends FhirResourceDaoDstu2<Patient>im
 	}
 
 	@Override
-	public IBundleProvider patientInstanceEverything(HttpServletRequest theServletRequest, IIdType theId, UnsignedIntDt theCount, DateRangeParam theLastUpdated, SortSpec theSort, StringAndListParam theContent, StringAndListParam theNarrative) {
+	public IBundleProvider patientInstanceEverything(HttpServletRequest theServletRequest, IIdType theId, IPrimitiveType<Integer> theCount, DateRangeParam theLastUpdated, SortSpec theSort, StringAndListParam theContent, StringAndListParam theNarrative) {
 		// Notify interceptors
 		ActionRequestDetails requestDetails = new ActionRequestDetails(null, getResourceName());
 		notifyInterceptors(RestOperationTypeEnum.EXTENDED_OPERATION_INSTANCE, requestDetails);
@@ -75,7 +75,7 @@ public class FhirResourceDaoPatientDstu2 extends FhirResourceDaoDstu2<Patient>im
 	}
 
 	@Override
-	public IBundleProvider patientTypeEverything(HttpServletRequest theServletRequest, UnsignedIntDt theCount, DateRangeParam theLastUpdated, SortSpec theSort, StringAndListParam theContent, StringAndListParam theNarrative) {
+	public IBundleProvider patientTypeEverything(HttpServletRequest theServletRequest, IPrimitiveType<Integer> theCount, DateRangeParam theLastUpdated, SortSpec theSort, StringAndListParam theContent, StringAndListParam theNarrative) {
 		// Notify interceptors
 		ActionRequestDetails requestDetails = new ActionRequestDetails(null, getResourceName());
 		notifyInterceptors(RestOperationTypeEnum.EXTENDED_OPERATION_TYPE, requestDetails);

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoPatientDstu21.java

@@ -26,10 +26,10 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.hl7.fhir.dstu21.model.Patient;
 import org.hl7.fhir.instance.model.api.IIdType;
+import org.hl7.fhir.instance.model.api.IPrimitiveType;
 
 import ca.uhn.fhir.jpa.dao.SearchParameterMap.EverythingModeEnum;
 import ca.uhn.fhir.model.api.IResource;
-import ca.uhn.fhir.model.primitive.UnsignedIntDt;
 import ca.uhn.fhir.rest.api.RestOperationTypeEnum;
 import ca.uhn.fhir.rest.api.SortSpec;
 import ca.uhn.fhir.rest.param.DateRangeParam;
@@ -41,7 +41,7 @@ import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor.ActionRequestDetai
 
 public class FhirResourceDaoPatientDstu21 extends FhirResourceDaoDstu21<Patient>implements IFhirResourceDaoPatient<Patient> {
 
-	private IBundleProvider doEverythingOperation(IIdType theId, UnsignedIntDt theCount, DateRangeParam theLastUpdated, SortSpec theSort, StringAndListParam theContent, StringAndListParam theNarrative) {
+	private IBundleProvider doEverythingOperation(IIdType theId, IPrimitiveType<Integer> theCount, DateRangeParam theLastUpdated, SortSpec theSort, StringAndListParam theContent, StringAndListParam theNarrative) {
 		SearchParameterMap paramMap = new SearchParameterMap();
 		if (theCount != null) {
 			paramMap.setCount(theCount.getValue());
@@ -66,7 +66,7 @@ public class FhirResourceDaoPatientDstu21 extends FhirResourceDaoDstu21<Patient>
 	}
 
 	@Override
-	public IBundleProvider patientInstanceEverything(HttpServletRequest theServletRequest, IIdType theId, UnsignedIntDt theCount, DateRangeParam theLastUpdated, SortSpec theSort, StringAndListParam theContent, StringAndListParam theNarrative) {
+	public IBundleProvider patientInstanceEverything(HttpServletRequest theServletRequest, IIdType theId, IPrimitiveType<Integer> theCount, DateRangeParam theLastUpdated, SortSpec theSort, StringAndListParam theContent, StringAndListParam theNarrative) {
 		// Notify interceptors
 		ActionRequestDetails requestDetails = new ActionRequestDetails(null, getResourceName());
 		notifyInterceptors(RestOperationTypeEnum.EXTENDED_OPERATION_INSTANCE, requestDetails);
@@ -75,7 +75,7 @@ public class FhirResourceDaoPatientDstu21 extends FhirResourceDaoDstu21<Patient>
 	}
 
 	@Override
-	public IBundleProvider patientTypeEverything(HttpServletRequest theServletRequest, UnsignedIntDt theCount, DateRangeParam theLastUpdated, SortSpec theSort, StringAndListParam theContent, StringAndListParam theNarrative) {
+	public IBundleProvider patientTypeEverything(HttpServletRequest theServletRequest, IPrimitiveType<Integer> theCount, DateRangeParam theLastUpdated, SortSpec theSort, StringAndListParam theContent, StringAndListParam theNarrative) {
 		// Notify interceptors
 		ActionRequestDetails requestDetails = new ActionRequestDetails(null, getResourceName());
 		notifyInterceptors(RestOperationTypeEnum.EXTENDED_OPERATION_TYPE, requestDetails);

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoSubscriptionDstu21.java

@@ -32,6 +32,7 @@ import javax.persistence.Query;
 import org.apache.commons.lang3.time.DateUtils;
 import org.hl7.fhir.dstu21.model.Subscription;
 import org.hl7.fhir.dstu21.model.Subscription.SubscriptionStatus;
+import org.hl7.fhir.instance.model.api.IAnyResource;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.instance.model.api.IIdType;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,8 +53,6 @@ import ca.uhn.fhir.jpa.dao.data.ISubscriptionTableDao;
 import ca.uhn.fhir.jpa.entity.ResourceTable;
 import ca.uhn.fhir.jpa.entity.SubscriptionFlaggedResource;
 import ca.uhn.fhir.jpa.entity.SubscriptionTable;
-import ca.uhn.fhir.model.api.IResource;
-import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum;
 import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum;
 import ca.uhn.fhir.model.dstu2.valueset.SubscriptionStatusEnum;
 import ca.uhn.fhir.model.primitive.IdDt;
@@ -175,9 +174,10 @@ public class FhirResourceDaoSubscriptionDstu21 extends FhirResourceDaoDstu21<Sub
 
 		List<SubscriptionFlaggedResource> flags = new ArrayList<SubscriptionFlaggedResource>();
 		Date mostRecentMatch = null;
-		for (IBaseResource next : results.getResources(0, results.size())) {
+		for (IBaseResource nextBase : results.getResources(0, results.size())) {
+			IAnyResource next = (IAnyResource)nextBase;
 
-			Date updated = ResourceMetadataKeyEnum.UPDATED.get((IResource) next).getValue();
+			Date updated = next.getMeta().getLastUpdated();
 			if (mostRecentMatch == null) {
 				mostRecentMatch = updated;
 			} else {
@@ -189,7 +189,7 @@ public class FhirResourceDaoSubscriptionDstu21 extends FhirResourceDaoDstu21<Sub
 			}
 
 			SubscriptionFlaggedResource nextFlag = new SubscriptionFlaggedResource();
-			Long pid = IDao.RESOURCE_PID.get((IResource) next);
+			Long pid = IDao.RESOURCE_PID.get(next);
 			
 			ourLog.info("New resource for subscription: {}", pid);
 			
@@ -274,7 +274,7 @@ public class FhirResourceDaoSubscriptionDstu21 extends FhirResourceDaoDstu21<Sub
 		} else {
 			Query q = myEntityManager.createNamedQuery("Q_HFJ_SUBSCRIPTION_SET_STATUS");
 			q.setParameter("res_id", resourceId);
-			q.setParameter("status", resource.getStatusElement().getValue());
+			q.setParameter("status", resource.getStatusElement().getValueAsString());
 			if (q.executeUpdate() > 0) {
 				ourLog.info("Updated subscription status for subscription {} to {}", resourceId, resource.getStatus());
 			} else {

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IFhirResourceDaoEncounter.java

@@ -23,17 +23,17 @@ import javax.servlet.http.HttpServletRequest;
  */
 
 import org.hl7.fhir.instance.model.api.IBaseResource;
+import org.hl7.fhir.instance.model.api.IIdType;
+import org.hl7.fhir.instance.model.api.IPrimitiveType;
 
-import ca.uhn.fhir.model.primitive.IdDt;
-import ca.uhn.fhir.model.primitive.UnsignedIntDt;
 import ca.uhn.fhir.rest.api.SortSpec;
 import ca.uhn.fhir.rest.param.DateRangeParam;
 import ca.uhn.fhir.rest.server.IBundleProvider;
 
 public interface IFhirResourceDaoEncounter<T extends IBaseResource> extends IFhirResourceDao<T> {
 
-	IBundleProvider encounterInstanceEverything(HttpServletRequest theServletRequest, IdDt theId, UnsignedIntDt theCount, DateRangeParam theLastUpdate, SortSpec theSort);
+	IBundleProvider encounterInstanceEverything(HttpServletRequest theServletRequest, IIdType theId, IPrimitiveType<Integer> theCount, DateRangeParam theLastUpdate, SortSpec theSort);
 
-	IBundleProvider encounterTypeEverything(HttpServletRequest theServletRequest, UnsignedIntDt theCount, DateRangeParam theLastUpdated, SortSpec theSortSpec);
+	IBundleProvider encounterTypeEverything(HttpServletRequest theServletRequest, IPrimitiveType<Integer> theCount, DateRangeParam theLastUpdated, SortSpec theSortSpec);
 
 }

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/IFhirResourceDaoPatient.java

@@ -24,8 +24,8 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.instance.model.api.IIdType;
+import org.hl7.fhir.instance.model.api.IPrimitiveType;
 
-import ca.uhn.fhir.model.primitive.UnsignedIntDt;
 import ca.uhn.fhir.rest.api.SortSpec;
 import ca.uhn.fhir.rest.param.DateRangeParam;
 import ca.uhn.fhir.rest.param.StringAndListParam;
@@ -33,8 +33,8 @@ import ca.uhn.fhir.rest.server.IBundleProvider;
 
 public interface IFhirResourceDaoPatient<T extends IBaseResource> extends IFhirResourceDao<T> {
 
-	IBundleProvider patientInstanceEverything(HttpServletRequest theServletRequest, IIdType theId, UnsignedIntDt theCount, DateRangeParam theLastUpdate, SortSpec theSort, StringAndListParam theContent, StringAndListParam theNarrative);
+	IBundleProvider patientInstanceEverything(HttpServletRequest theServletRequest, IIdType theId, IPrimitiveType<Integer> theCount, DateRangeParam theLastUpdate, SortSpec theSort, StringAndListParam theContent, StringAndListParam theNarrative);
 
-	IBundleProvider patientTypeEverything(HttpServletRequest theServletRequest, UnsignedIntDt theCount, DateRangeParam theLastUpdated, SortSpec theSortSpec, StringAndListParam theContent, StringAndListParam theNarrative);
+	IBundleProvider patientTypeEverything(HttpServletRequest theServletRequest, IPrimitiveType<Integer> theCount, DateRangeParam theLastUpdated, SortSpec theSortSpec, StringAndListParam theContent, StringAndListParam theNarrative);
 
 }

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchParamExtractorDstu21.java

@@ -207,7 +207,7 @@ public class SearchParamExtractorDstu21 extends BaseSearchParamExtractor impleme
 						continue;
 					}
 
-					if (new UriType(BaseHapiFhirDao.UCUM_NS).equals(nextValue.getSystemElement())) {
+					if (BaseHapiFhirDao.UCUM_NS.equals(nextValue.getSystem())) {
 						if (isNotBlank(nextValue.getCode())) {
 
 							Unit<? extends javax.measure.quantity.Quantity> unit = Unit.valueOf(nextValue.getCode());
@@ -441,12 +441,12 @@ public class SearchParamExtractorDstu21 extends BaseSearchParamExtractor impleme
 			List<String> codes = new ArrayList<String>();
 
 			String needContactPointSystem = null;
-			if (nextPath.endsWith("(system=phone)")) {
-				nextPath = nextPath.substring(0, nextPath.length() - "(system=phone)".length());
+			if (nextPath.endsWith(".where(system='phone')")) {
+				nextPath = nextPath.substring(0, nextPath.length() - ".where(system='phone')".length());
 				needContactPointSystem = "phone";
 			}
-			if (nextPath.endsWith("(system=email)")) {
-				nextPath = nextPath.substring(0, nextPath.length() - "(system=email)".length());
+			if (nextPath.endsWith(".where(system='email')")) {
+				nextPath = nextPath.substring(0, nextPath.length() - ".where(system='email')".length());
 				needContactPointSystem = "email";
 			}
 

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderEncounterDstu21.java

@@ -1,6 +1,8 @@
 package ca.uhn.fhir.jpa.provider;
 
 import org.hl7.fhir.dstu21.model.Encounter;
+import org.hl7.fhir.dstu21.model.IdType;
+import org.hl7.fhir.dstu21.model.UnsignedIntType;
 
 /*
  * #%L
@@ -44,11 +46,11 @@ public class BaseJpaResourceProviderEncounterDstu21 extends JpaResourceProviderD
 			javax.servlet.http.HttpServletRequest theServletRequest,
 
 			@IdParam 
-			ca.uhn.fhir.model.primitive.IdDt theId,
+			IdType theId,
 			
 			@Description(formalDefinition="Results from this method are returned across multiple pages. This parameter controls the size of those pages.") 
 			@OperationParam(name = Constants.PARAM_COUNT) 
-			ca.uhn.fhir.model.primitive.UnsignedIntDt theCount,
+			UnsignedIntType theCount,
 			
 			@Description(shortDefinition="Only return resources which were last updated as specified by the given range")
 			@OperationParam(name = Constants.PARAM_LASTUPDATED, min=0, max=1) 
@@ -77,7 +79,7 @@ public class BaseJpaResourceProviderEncounterDstu21 extends JpaResourceProviderD
 
 				@Description(formalDefinition="Results from this method are returned across multiple pages. This parameter controls the size of those pages.") 
 				@OperationParam(name = Constants.PARAM_COUNT) 
-				ca.uhn.fhir.model.primitive.UnsignedIntDt theCount,
+				UnsignedIntType theCount,
 				
 				@Description(shortDefinition="Only return resources which were last updated as specified by the given range")
 				@OperationParam(name = Constants.PARAM_LASTUPDATED, min=0, max=1) 

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/BaseJpaResourceProviderPatientDstu21.java

@@ -4,7 +4,10 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
 import java.util.List;
 
+import org.hl7.fhir.dstu21.model.IdType;
 import org.hl7.fhir.dstu21.model.Patient;
+import org.hl7.fhir.dstu21.model.StringType;
+import org.hl7.fhir.dstu21.model.UnsignedIntType;
 
 /*
  * #%L
@@ -28,7 +31,6 @@ import org.hl7.fhir.dstu21.model.Patient;
 
 import ca.uhn.fhir.jpa.dao.IFhirResourceDaoPatient;
 import ca.uhn.fhir.model.api.annotation.Description;
-import ca.uhn.fhir.model.primitive.StringDt;
 import ca.uhn.fhir.rest.annotation.IdParam;
 import ca.uhn.fhir.rest.annotation.Operation;
 import ca.uhn.fhir.rest.annotation.OperationParam;
@@ -52,11 +54,11 @@ public class BaseJpaResourceProviderPatientDstu21 extends JpaResourceProviderDst
 			javax.servlet.http.HttpServletRequest theServletRequest,
 
 			@IdParam 
-			ca.uhn.fhir.model.primitive.IdDt theId,
+			IdType theId,
 			
 			@Description(formalDefinition="Results from this method are returned across multiple pages. This parameter controls the size of those pages.") 
 			@OperationParam(name = Constants.PARAM_COUNT) 
-			ca.uhn.fhir.model.primitive.UnsignedIntDt theCount,
+			UnsignedIntType theCount,
 			
 			@Description(shortDefinition="Only return resources which were last updated as specified by the given range")
 			@OperationParam(name = Constants.PARAM_LASTUPDATED, min=0, max=1) 
@@ -64,11 +66,11 @@ public class BaseJpaResourceProviderPatientDstu21 extends JpaResourceProviderDst
 
 			@Description(shortDefinition="Filter the resources to return only resources matching the given _content filter (note that this filter is applied only to results which link to the given patient, not to the patient itself or to supporting resources linked to by the matched resources)")
 			@OperationParam(name = Constants.PARAM_CONTENT, min=0, max=OperationParam.MAX_UNLIMITED) 
-			List<StringDt> theContent,
+			List<StringType> theContent,
 
 			@Description(shortDefinition="Filter the resources to return only resources matching the given _text filter (note that this filter is applied only to results which link to the given patient, not to the patient itself or to supporting resources linked to by the matched resources)")
 			@OperationParam(name = Constants.PARAM_TEXT, min=0, max=OperationParam.MAX_UNLIMITED) 
-			List<StringDt> theNarrative,
+			List<StringType> theNarrative,
 
 			@Sort
 			SortSpec theSortSpec
@@ -94,7 +96,7 @@ public class BaseJpaResourceProviderPatientDstu21 extends JpaResourceProviderDst
 
 				@Description(formalDefinition="Results from this method are returned across multiple pages. This parameter controls the size of those pages.") 
 				@OperationParam(name = Constants.PARAM_COUNT) 
-				ca.uhn.fhir.model.primitive.UnsignedIntDt theCount,
+				UnsignedIntType theCount,
 				
 				@Description(shortDefinition="Only return resources which were last updated as specified by the given range")
 				@OperationParam(name = Constants.PARAM_LASTUPDATED, min=0, max=1) 
@@ -102,11 +104,11 @@ public class BaseJpaResourceProviderPatientDstu21 extends JpaResourceProviderDst
 
 				@Description(shortDefinition="Filter the resources to return only resources matching the given _content filter (note that this filter is applied only to results which link to the given patient, not to the patient itself or to supporting resources linked to by the matched resources)")
 				@OperationParam(name = Constants.PARAM_CONTENT, min=0, max=OperationParam.MAX_UNLIMITED) 
-				List<StringDt> theContent,
+				List<StringType> theContent,
 
 				@Description(shortDefinition="Filter the resources to return only resources matching the given _text filter (note that this filter is applied only to results which link to the given patient, not to the patient itself or to supporting resources linked to by the matched resources)")
 				@OperationParam(name = Constants.PARAM_TEXT, min=0, max=OperationParam.MAX_UNLIMITED) 
-				List<StringDt> theNarrative,
+				List<StringType> theNarrative,
 
 				@Sort
 				SortSpec theSortSpec
@@ -122,10 +124,10 @@ public class BaseJpaResourceProviderPatientDstu21 extends JpaResourceProviderDst
 
 	}
 
-	private StringAndListParam toStringAndList(List<StringDt> theNarrative) {
+	private StringAndListParam toStringAndList(List<StringType> theNarrative) {
 		StringAndListParam retVal = new StringAndListParam();
 		if (theNarrative != null) {
-			for (StringDt next : theNarrative) {
+			for (StringType next : theNarrative) {
 				if (isNotBlank(next.getValue())) {
 					retVal.addAnd(new StringOrListParam().addOr(new StringParam(next.getValue())));
 				}

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/JpaResourceProviderDstu21.java

@@ -22,12 +22,12 @@ package ca.uhn.fhir.jpa.provider;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.hl7.fhir.dstu21.model.IdType;
+import org.hl7.fhir.dstu21.model.Meta;
+import org.hl7.fhir.dstu21.model.Parameters;
 import org.hl7.fhir.instance.model.api.IAnyResource;
 
 import ca.uhn.fhir.jpa.dao.IFhirResourceDao;
-import ca.uhn.fhir.model.dstu2.composite.MetaDt;
-import ca.uhn.fhir.model.dstu2.resource.Parameters;
-import ca.uhn.fhir.model.primitive.IdDt;
 import ca.uhn.fhir.rest.annotation.ConditionalUrlParam;
 import ca.uhn.fhir.rest.annotation.Create;
 import ca.uhn.fhir.rest.annotation.Delete;
@@ -71,7 +71,7 @@ public class JpaResourceProviderDstu21<T extends IAnyResource> extends BaseJpaRe
 	}
 
 	@Delete()
-	public MethodOutcome delete(HttpServletRequest theRequest, @IdParam IdDt theResource, @ConditionalUrlParam(supportsMultiple=true) String theConditional) {
+	public MethodOutcome delete(HttpServletRequest theRequest, @IdParam IdType theResource, @ConditionalUrlParam(supportsMultiple=true) String theConditional) {
 		startRequest(theRequest);
 		try {
 			if (theConditional != null) {
@@ -86,49 +86,49 @@ public class JpaResourceProviderDstu21<T extends IAnyResource> extends BaseJpaRe
 
 	//@formatter:off
 	@Operation(name=OPERATION_NAME_META, idempotent=true, returnParameters= {
-		@OperationParam(name="return", type=MetaDt.class)
+		@OperationParam(name="return", type=Meta.class)
 	})
 	//@formatter:on
 	public Parameters meta() {
 		Parameters parameters = new Parameters();
-		MetaDt metaGetOperation = getDao().metaGetOperation(MetaDt.class);
+		Meta metaGetOperation = getDao().metaGetOperation(Meta.class);
 		parameters.addParameter().setName("return").setValue(metaGetOperation);
 		return parameters;
 	}
 
 	//@formatter:off
 	@Operation(name=OPERATION_NAME_META, idempotent=true, returnParameters= {
-		@OperationParam(name="return", type=MetaDt.class)
+		@OperationParam(name="return", type=Meta.class)
 	})
 	//@formatter:on
-	public Parameters meta(@IdParam IdDt theId) {
+	public Parameters meta(@IdParam IdType theId) {
 		Parameters parameters = new Parameters();
-		MetaDt metaGetOperation = getDao().metaGetOperation(MetaDt.class, theId);
+		Meta metaGetOperation = getDao().metaGetOperation(Meta.class, theId);
 		parameters.addParameter().setName("return").setValue(metaGetOperation);
 		return parameters;
 	}
 
 	//@formatter:off
 	@Operation(name=OPERATION_NAME_META_ADD, idempotent=true, returnParameters= {
-		@OperationParam(name="return", type=MetaDt.class)
+		@OperationParam(name="return", type=Meta.class)
 	})
 	//@formatter:on
-	public Parameters metaAdd(@IdParam IdDt theId, @OperationParam(name = "meta") MetaDt theMeta) {
+	public Parameters metaAdd(@IdParam IdType theId, @OperationParam(name = "meta") Meta theMeta) {
 		if (theMeta == null) {
 			throw new InvalidRequestException("Input contains no parameter with name 'meta'");
 		}
 		Parameters parameters = new Parameters();
-		MetaDt metaAddOperation = getDao().metaAddOperation(theId, theMeta);
+		Meta metaAddOperation = getDao().metaAddOperation(theId, theMeta);
 		parameters.addParameter().setName("return").setValue(metaAddOperation);
 		return parameters;
 	}
 
 	//@formatter:off
 	@Operation(name=OPERATION_NAME_META_DELETE, idempotent=true, returnParameters= {
-		@OperationParam(name="return", type=MetaDt.class)
+		@OperationParam(name="return", type=Meta.class)
 	})
 	//@formatter:on
-	public Parameters metaDelete(@IdParam IdDt theId, @OperationParam(name = "meta") MetaDt theMeta) {
+	public Parameters metaDelete(@IdParam IdType theId, @OperationParam(name = "meta") Meta theMeta) {
 		if (theMeta == null) {
 			throw new InvalidRequestException("Input contains no parameter with name 'meta'");
 		}
@@ -138,7 +138,7 @@ public class JpaResourceProviderDstu21<T extends IAnyResource> extends BaseJpaRe
 	}
 
 	@Update
-	public MethodOutcome update(HttpServletRequest theRequest, @ResourceParam T theResource, @IdParam IdDt theId, @ConditionalUrlParam String theConditional) {
+	public MethodOutcome update(HttpServletRequest theRequest, @ResourceParam T theResource, @IdParam IdType theId, @ConditionalUrlParam String theConditional) {
 		startRequest(theRequest);
 		try {
 			if (theConditional != null) {
@@ -159,7 +159,7 @@ public class JpaResourceProviderDstu21<T extends IAnyResource> extends BaseJpaRe
 	}
 		
 	@Validate
-	public MethodOutcome validate(@ResourceParam T theResource, @IdParam IdDt theId, @ResourceParam String theRawResource, @ResourceParam EncodingEnum theEncoding, @Validate.Mode ValidationModeEnum theMode,
+	public MethodOutcome validate(@ResourceParam T theResource, @IdParam IdType theId, @ResourceParam String theRawResource, @ResourceParam EncodingEnum theEncoding, @Validate.Mode ValidationModeEnum theMode,
 			@Validate.Profile String theProfile) {
 		return getDao().validate(theResource, theId, theRawResource, theEncoding, theMode, theProfile);
 	}

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/BaseJpaTest.java

@@ -7,6 +7,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.io.IOUtils;
+import org.hl7.fhir.dstu21.model.Bundle.BundleEntryComponent;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.instance.model.api.IIdType;
 import org.junit.AfterClass;
@@ -35,6 +36,16 @@ public class BaseJpaTest {
 		return retVal;
 	}
 
+	protected List<IIdType> toUnqualifiedVersionlessIds(org.hl7.fhir.dstu21.model.Bundle theFound) {
+		List<IIdType> retVal = new ArrayList<IIdType>();
+		for (BundleEntryComponent next : theFound.getEntry()) {
+			// if (next.getResource()!= null) {
+			retVal.add(next.getResource().getIdElement().toUnqualifiedVersionless());
+			// }
+		}
+		return retVal;
+	}
+
 	protected List<IIdType> toUnqualifiedVersionlessIds(IBundleProvider theFound) {
 		List<IIdType> retVal = new ArrayList<IIdType>();
 		int size = theFound.size();
@@ -46,6 +57,25 @@ public class BaseJpaTest {
 		return retVal;
 	}
 	
+	protected String[] toValues(IIdType... theValues) {
+		ArrayList<String> retVal = new ArrayList<String>();
+		for (IIdType next : theValues) {
+			retVal.add(next.getValue());
+		}
+		return retVal.toArray(new String[retVal.size()]);
+	}
+	
+	protected List<String> toUnqualifiedVersionlessIdValues(IBundleProvider theFound) {
+		List<String> retVal = new ArrayList<String>();
+		int size = theFound.size();
+		ourLog.info("Found {} results", size);
+		List<IBaseResource> resources = theFound.getResources(0, size);
+		for (IBaseResource next : resources) {
+			retVal.add(next.getIdElement().toUnqualifiedVersionless().getValue());
+		}
+		return retVal;
+	}
+
 	protected List<IIdType> toUnqualifiedVersionlessIds(List<IBaseResource> theFound) {
 		List<IIdType> retVal = new ArrayList<IIdType>();
 		for (IBaseResource next : theFound) {

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirResourceDaoDstu21SearchFtTest.java

@@ -57,16 +57,16 @@ public class FhirResourceDaoDstu21SearchFtTest extends BaseJpaDstu21Test {
 		
 		map = new SearchParameterMap();
 		map.add(Observation.SP_CODE, new TokenParam(null, "blood").setText(true));
-		assertThat(toUnqualifiedVersionlessIds(myObservationDao.search(map)), containsInAnyOrder(id1, id2));
+		assertThat(toUnqualifiedVersionlessIdValues(myObservationDao.search(map)), containsInAnyOrder(toValues(id1, id2)));
 
 		map = new SearchParameterMap();
 		map.add(Observation.SP_CODE, new TokenParam(null, "blood").setText(true));
-		assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(map)), empty());
+		assertThat(toUnqualifiedVersionlessIdValues(myPatientDao.search(map)), empty());
 
 		map = new SearchParameterMap();
 		map.add(Observation.SP_CODE, new TokenParam(null, "blood").setText(true));
 		map.add(Constants.PARAM_CONTENT, new StringParam("obs1"));
-		assertThat(toUnqualifiedVersionlessIds(myObservationDao.search(map)), containsInAnyOrder(id1));
+		assertThat(toUnqualifiedVersionlessIdValues(myObservationDao.search(map)), containsInAnyOrder(toValues(id1)));
 
 	}
 
@@ -89,7 +89,7 @@ public class FhirResourceDaoDstu21SearchFtTest extends BaseJpaDstu21Test {
 		
 		map = new SearchParameterMap();
 		map.add(Observation.SP_VALUE_STRING, new StringParam("sure").setContains(true));
-		assertThat(toUnqualifiedVersionlessIds(myObservationDao.search(map)), containsInAnyOrder(id1, id2));
+		assertThat(toUnqualifiedVersionlessIdValues(myObservationDao.search(map)), containsInAnyOrder(toValues(id1, id2)));
 
 	}
 
@@ -215,11 +215,11 @@ public class FhirResourceDaoDstu21SearchFtTest extends BaseJpaDstu21Test {
 
 		map = new SearchParameterMap();
 		map.add(Constants.PARAM_CONTENT, new StringParam("NAMEAAA"));
-		assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(map)), contains(pId1));
+		assertThat(toUnqualifiedVersionlessIdValues(myPatientDao.search(map)), contains(toValues(pId1)));
 
 		map = new SearchParameterMap();
 		map.add(Constants.PARAM_TEXT, new StringParam("DIVAAA"));
-		assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(map)), contains(pId1));
+		assertThat(toUnqualifiedVersionlessIdValues(myPatientDao.search(map)), contains(toValues(pId1)));
 
 		/*
 		 * Reindex
@@ -233,19 +233,19 @@ public class FhirResourceDaoDstu21SearchFtTest extends BaseJpaDstu21Test {
 
 		map = new SearchParameterMap();
 		map.add(Constants.PARAM_CONTENT, new StringParam("NAMEAAA"));
-		assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(map)), empty());
+		assertThat(toUnqualifiedVersionlessIdValues(myPatientDao.search(map)), empty());
 
 		map = new SearchParameterMap();
 		map.add(Patient.SP_NAME, new StringParam("NAMEBBB"));
-		assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(map)), contains(pId1));
+		assertThat(toUnqualifiedVersionlessIdValues(myPatientDao.search(map)), contains(toValues(pId1)));
 
 		map = new SearchParameterMap();
 		map.add(Constants.PARAM_CONTENT, new StringParam("NAMEBBB"));
-		assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(map)), contains(pId1));
+		assertThat(toUnqualifiedVersionlessIdValues(myPatientDao.search(map)), contains(toValues(pId1)));
 
 		map = new SearchParameterMap();
 		map.add(Constants.PARAM_TEXT, new StringParam("DIVBBB"));
-		assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(map)), contains(pId1));
+		assertThat(toUnqualifiedVersionlessIdValues(myPatientDao.search(map)), contains(toValues(pId1)));
 
 	}
 
@@ -288,7 +288,7 @@ public class FhirResourceDaoDstu21SearchFtTest extends BaseJpaDstu21Test {
 		IIdType obsId3 = myObservationDao.create(obs3).getId().toUnqualifiedVersionless();
 		
 		HttpServletRequest request;
-		List<IIdType> actual;
+		List<String> actual;
 		request = mock(HttpServletRequest.class);
 		StringAndListParam param;
 		
@@ -296,17 +296,17 @@ public class FhirResourceDaoDstu21SearchFtTest extends BaseJpaDstu21Test {
 		
 		param = new StringAndListParam();
 		param.addAnd(new StringOrListParam().addOr(new StringParam("obsvalue1")));
-		actual = toUnqualifiedVersionlessIds(myPatientDao.patientInstanceEverything(request, ptId1, null, null, null, param, null));
-		assertThat(actual, containsInAnyOrder(ptId1, obsId1, devId1));
+		actual = toUnqualifiedVersionlessIdValues(myPatientDao.patientInstanceEverything(request, ptId1, null, null, null, param, null));
+		assertThat(actual, containsInAnyOrder(toValues(ptId1, obsId1, devId1)));
 
 		param = new StringAndListParam();
 		param.addAnd(new StringOrListParam().addOr(new StringParam("obstext1")));
-		actual = toUnqualifiedVersionlessIds(myPatientDao.patientInstanceEverything(request, ptId1, null, null, null, null, param));
-		assertThat(actual, containsInAnyOrder(ptId1, obsId1, devId1));
+		actual = toUnqualifiedVersionlessIdValues(myPatientDao.patientInstanceEverything(request, ptId1, null, null, null, null, param));
+		assertThat(actual, containsInAnyOrder(toValues(ptId1, obsId1, devId1)));
 
 		request = mock(HttpServletRequest.class);
-		actual = toUnqualifiedVersionlessIds(myPatientDao.patientInstanceEverything(request, ptId1, null, null, null, null, null));
-		assertThat(actual, containsInAnyOrder(ptId1, obsId1, obsId2, devId1));
+		actual = toUnqualifiedVersionlessIdValues(myPatientDao.patientInstanceEverything(request, ptId1, null, null, null, null, null));
+		assertThat(actual, containsInAnyOrder(toValues(ptId1, obsId1, obsId2, devId1)));
 
 		/*
 		 * Add another match
@@ -321,8 +321,8 @@ public class FhirResourceDaoDstu21SearchFtTest extends BaseJpaDstu21Test {
 
 		param = new StringAndListParam();
 		param.addAnd(new StringOrListParam().addOr(new StringParam("obsvalue1")));
-		actual = toUnqualifiedVersionlessIds(myPatientDao.patientInstanceEverything(request, ptId1, null, null, null, param, null));
-		assertThat(actual, containsInAnyOrder(ptId1, obsId1, obsId4, devId1));
+		actual = toUnqualifiedVersionlessIdValues(myPatientDao.patientInstanceEverything(request, ptId1, null, null, null, param, null));
+		assertThat(actual, containsInAnyOrder(toValues(ptId1, obsId1, obsId4, devId1)));
 
 		/*
 		 * Make one previous match no longer match
@@ -337,8 +337,8 @@ public class FhirResourceDaoDstu21SearchFtTest extends BaseJpaDstu21Test {
 
 		param = new StringAndListParam();
 		param.addAnd(new StringOrListParam().addOr(new StringParam("obsvalue1")));
-		actual = toUnqualifiedVersionlessIds(myPatientDao.patientInstanceEverything(request, ptId1, null, null, null, param, null));
-		assertThat(actual, containsInAnyOrder(ptId1, obsId4));
+		actual = toUnqualifiedVersionlessIdValues(myPatientDao.patientInstanceEverything(request, ptId1, null, null, null, param, null));
+		assertThat(actual, containsInAnyOrder(toValues(ptId1, obsId4)));
 
 	}
 	
@@ -380,7 +380,7 @@ public class FhirResourceDaoDstu21SearchFtTest extends BaseJpaDstu21Test {
 		IIdType obsId3 = myObservationDao.create(obs3).getId().toUnqualifiedVersionless();
 		
 		HttpServletRequest request;
-		List<IIdType> actual;
+		List<String> actual;
 		request = mock(HttpServletRequest.class);
 		StringAndListParam param;
 		
@@ -388,12 +388,12 @@ public class FhirResourceDaoDstu21SearchFtTest extends BaseJpaDstu21Test {
 		
 		param = new StringAndListParam();
 		param.addAnd(new StringOrListParam().addOr(new StringParam("obsvalue1")));
-		actual = toUnqualifiedVersionlessIds(myPatientDao.patientTypeEverything(request, null, null, null, param, null));
-		assertThat(actual, containsInAnyOrder(ptId1, obsId1, devId1));
+		actual = toUnqualifiedVersionlessIdValues(myPatientDao.patientTypeEverything(request, null, null, null, param, null));
+		assertThat(actual, containsInAnyOrder(toValues(ptId1, obsId1, devId1)));
 
 		request = mock(HttpServletRequest.class);
-		actual = toUnqualifiedVersionlessIds(myPatientDao.patientTypeEverything(request, null, null, null, null, null));
-		assertThat(actual, containsInAnyOrder(ptId1, obsId1, obsId2, devId1, ptId2, obsId3));
+		actual = toUnqualifiedVersionlessIdValues(myPatientDao.patientTypeEverything(request, null, null, null, null, null));
+		assertThat(actual, containsInAnyOrder(toValues(ptId1, obsId1, obsId2, devId1, ptId2, obsId3)));
 
 		/*
 		 * Add another match
@@ -408,8 +408,8 @@ public class FhirResourceDaoDstu21SearchFtTest extends BaseJpaDstu21Test {
 
 		param = new StringAndListParam();
 		param.addAnd(new StringOrListParam().addOr(new StringParam("obsvalue1")));
-		actual = toUnqualifiedVersionlessIds(myPatientDao.patientTypeEverything(request, null, null, null, param, null));
-		assertThat(actual, containsInAnyOrder(ptId1, obsId1, obsId4, devId1));
+		actual = toUnqualifiedVersionlessIdValues(myPatientDao.patientTypeEverything(request, null, null, null, param, null));
+		assertThat(actual, containsInAnyOrder(toValues(ptId1, obsId1, obsId4, devId1)));
 
 		/*
 		 * Make one previous match no longer match
@@ -424,8 +424,8 @@ public class FhirResourceDaoDstu21SearchFtTest extends BaseJpaDstu21Test {
 
 		param = new StringAndListParam();
 		param.addAnd(new StringOrListParam().addOr(new StringParam("obsvalue1")));
-		actual = toUnqualifiedVersionlessIds(myPatientDao.patientTypeEverything(request, null, null, null, param, null));
-		assertThat(actual, containsInAnyOrder(ptId1, obsId4));
+		actual = toUnqualifiedVersionlessIdValues(myPatientDao.patientTypeEverything(request, null, null, null, param, null));
+		assertThat(actual, containsInAnyOrder(toValues(ptId1, obsId4)));
 
 	}
 
@@ -446,11 +446,11 @@ public class FhirResourceDaoDstu21SearchFtTest extends BaseJpaDstu21Test {
 
 		map = new SearchParameterMap();
 		map.add(Constants.PARAM_CONTENT, new StringParam("NAMEAAA"));
-		assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(map)), contains(pId1));
+		assertThat(toUnqualifiedVersionlessIdValues(myPatientDao.search(map)), contains(toValues(pId1)));
 
 		map = new SearchParameterMap();
 		map.add(Constants.PARAM_TEXT, new StringParam("DIVAAA"));
-		assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(map)), contains(pId1));
+		assertThat(toUnqualifiedVersionlessIdValues(myPatientDao.search(map)), contains(toValues(pId1)));
 
 		/*
 		 * Update but don't reindex
@@ -464,28 +464,28 @@ public class FhirResourceDaoDstu21SearchFtTest extends BaseJpaDstu21Test {
 
 		map = new SearchParameterMap();
 		map.add(Constants.PARAM_CONTENT, new StringParam("NAMEAAA"));
-		assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(map)), contains(pId1));
+		assertThat(toUnqualifiedVersionlessIdValues(myPatientDao.search(map)), contains(toValues(pId1)));
 		map = new SearchParameterMap();
 		map.add(Constants.PARAM_CONTENT, new StringParam("NAMEBBB"));
-		assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(map)), not(contains(pId1)));
+		assertThat(toUnqualifiedVersionlessIdValues(myPatientDao.search(map)), not(contains(toValues(pId1))));
 
 		myPatientDao.update(patient, null, true);
 
 		map = new SearchParameterMap();
 		map.add(Constants.PARAM_CONTENT, new StringParam("NAMEAAA"));
-		assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(map)), empty());
+		assertThat(toUnqualifiedVersionlessIdValues(myPatientDao.search(map)), empty());
 
 		map = new SearchParameterMap();
 		map.add(Patient.SP_NAME, new StringParam("NAMEBBB"));
-		assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(map)), contains(pId1));
+		assertThat(toUnqualifiedVersionlessIdValues(myPatientDao.search(map)), contains(toValues(pId1)));
 
 		map = new SearchParameterMap();
 		map.add(Constants.PARAM_CONTENT, new StringParam("NAMEBBB"));
-		assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(map)), contains(pId1));
+		assertThat(toUnqualifiedVersionlessIdValues(myPatientDao.search(map)), contains(toValues(pId1)));
 
 		map = new SearchParameterMap();
 		map.add(Constants.PARAM_TEXT, new StringParam("DIVBBB"));
-		assertThat(toUnqualifiedVersionlessIds(myPatientDao.search(map)), contains(pId1));
+		assertThat(toUnqualifiedVersionlessIdValues(myPatientDao.search(map)), contains(toValues(pId1)));
 
 	}
 
@@ -510,18 +510,18 @@ public class FhirResourceDaoDstu21SearchFtTest extends BaseJpaDstu21Test {
 		obs.setValue(new StringType("Another fullText"));
 		IIdType oId2 = myObservationDao.create(obs).getId().toUnqualifiedVersionless();
 
-		List<IIdType> patients;
+		List<String> patients;
 		SearchParameterMap params;
 
 		params = new SearchParameterMap();
 		params.add(Constants.PARAM_CONTENT, new StringParam("fulltext"));
-		patients = toUnqualifiedVersionlessIds(myPatientDao.search(params));
-		assertThat(patients, containsInAnyOrder(pId1));
+		patients = toUnqualifiedVersionlessIdValues(myPatientDao.search(params));
+		assertThat(patients, containsInAnyOrder(toValues(pId1)));
 
 		params = new SearchParameterMap();
 		params.add(Constants.PARAM_CONTENT, new StringParam("FULLTEXT"));
-		patients = toUnqualifiedVersionlessIds(myObservationDao.search(params));
-		assertThat(patients, containsInAnyOrder(oId1, oId2));
+		patients = toUnqualifiedVersionlessIdValues(myObservationDao.search(params));
+		assertThat(patients, containsInAnyOrder(toValues(oId1, oId2)));
 
 	}
 

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirResourceDaoDstu21SearchNoFtTest.java

@@ -14,7 +14,6 @@ import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -36,7 +35,6 @@ import org.hl7.fhir.dstu21.model.DiagnosticReport;
 import org.hl7.fhir.dstu21.model.Encounter;
 import org.hl7.fhir.dstu21.model.IdType;
 import org.hl7.fhir.dstu21.model.Immunization;
-import org.hl7.fhir.dstu21.model.InstantType;
 import org.hl7.fhir.dstu21.model.Location;
 import org.hl7.fhir.dstu21.model.Medication;
 import org.hl7.fhir.dstu21.model.MedicationOrder;
@@ -69,9 +67,7 @@ import ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamToken;
 import ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamUri;
 import ca.uhn.fhir.jpa.entity.ResourceLink;
 import ca.uhn.fhir.model.api.IQueryParameterType;
-import ca.uhn.fhir.model.api.IResource;
 import ca.uhn.fhir.model.api.Include;
-import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum;
 import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum;
 import ca.uhn.fhir.rest.api.SortOrderEnum;
 import ca.uhn.fhir.rest.api.SortSpec;
@@ -588,9 +584,9 @@ public class FhirResourceDaoDstu21SearchNoFtTest extends BaseJpaDstu21Test {
 		{
 			Map<String, IQueryParameterType> params = new HashMap<String, IQueryParameterType>();
 			params.put(BaseResource.SP_RES_LANGUAGE, new StringParam("en_CA"));
-			List<IResource> patients = toList(myPatientDao.search(params));
+			List<IBaseResource> patients = toList(myPatientDao.search(params));
 			assertEquals(1, patients.size());
-			assertEquals(id1.toUnqualifiedVersionless(), patients.get(0).getId().toUnqualifiedVersionless());
+			assertEquals(id1.toUnqualifiedVersionless(), patients.get(0).getIdElement().toUnqualifiedVersionless());
 		}
 		{
 			Map<String, IQueryParameterType> params = new HashMap<String, IQueryParameterType>();
@@ -1468,7 +1464,7 @@ public class FhirResourceDaoDstu21SearchNoFtTest extends BaseJpaDstu21Test {
 			params.addInclude(Patient.INCLUDE_ORGANIZATION);
 			params.addInclude(Organization.INCLUDE_PARTOF.asNonRecursive());
 			IBundleProvider search = myPatientDao.search(params);
-			List<IResource> patients = toList(search);
+			List<IBaseResource> patients = toList(search);
 			assertEquals(2, patients.size());
 			assertEquals(Patient.class, patients.get(0).getClass());
 			assertEquals(Organization.class, patients.get(1).getClass());
@@ -1480,7 +1476,7 @@ public class FhirResourceDaoDstu21SearchNoFtTest extends BaseJpaDstu21Test {
 			params.addInclude(Patient.INCLUDE_ORGANIZATION);
 			params.addInclude(Organization.INCLUDE_PARTOF.asRecursive());
 			IBundleProvider search = myPatientDao.search(params);
-			List<IResource> patients = toList(search);
+			List<IBaseResource> patients = toList(search);
 			assertEquals(3, patients.size());
 			assertEquals(Patient.class, patients.get(0).getClass());
 			assertEquals(Organization.class, patients.get(1).getClass());
@@ -1490,9 +1486,9 @@ public class FhirResourceDaoDstu21SearchNoFtTest extends BaseJpaDstu21Test {
 			// * include non recursive
 			SearchParameterMap params = new SearchParameterMap();
 			params.add(Patient.SP_FAMILY, new StringParam("Tester_" + methodName + "_P1"));
-			params.addInclude(IResource.INCLUDE_ALL.asNonRecursive());
+			params.addInclude(IBaseResource.INCLUDE_ALL.asNonRecursive());
 			IBundleProvider search = myPatientDao.search(params);
-			List<IResource> patients = toList(search);
+			List<IBaseResource> patients = toList(search);
 			assertEquals(2, patients.size());
 			assertEquals(Patient.class, patients.get(0).getClass());
 			assertEquals(Organization.class, patients.get(1).getClass());
@@ -1501,9 +1497,9 @@ public class FhirResourceDaoDstu21SearchNoFtTest extends BaseJpaDstu21Test {
 			// * include recursive
 			SearchParameterMap params = new SearchParameterMap();
 			params.add(Patient.SP_FAMILY, new StringParam("Tester_" + methodName + "_P1"));
-			params.addInclude(IResource.INCLUDE_ALL.asRecursive());
+			params.addInclude(IBaseResource.INCLUDE_ALL.asRecursive());
 			IBundleProvider search = myPatientDao.search(params);
-			List<IResource> patients = toList(search);
+			List<IBaseResource> patients = toList(search);
 			assertEquals(3, patients.size());
 			assertEquals(Patient.class, patients.get(0).getClass());
 			assertEquals(Organization.class, patients.get(1).getClass());
@@ -1515,7 +1511,7 @@ public class FhirResourceDaoDstu21SearchNoFtTest extends BaseJpaDstu21Test {
 			params.add(Patient.SP_FAMILY, new StringParam("Tester_" + methodName + "_P1"));
 			params.addInclude(Encounter.INCLUDE_INDICATION);
 			IBundleProvider search = myPatientDao.search(params);
-			List<IResource> patients = toList(search);
+			List<IBaseResource> patients = toList(search);
 			assertEquals(1, patients.size());
 			assertEquals(Patient.class, patients.get(0).getClass());
 		}
@@ -1717,7 +1713,7 @@ public class FhirResourceDaoDstu21SearchNoFtTest extends BaseJpaDstu21Test {
 		params.add(Patient.SP_FAMILY, new StringParam("Tester_testSearchWithIncludesThatHaveTextId_P1"));
 		params.addInclude(Patient.INCLUDE_ORGANIZATION);
 		IBundleProvider search = myPatientDao.search(params);
-		List<IResource> patients = toList(search);
+		List<IBaseResource> patients = toList(search);
 		assertEquals(2, patients.size());
 		assertEquals(Patient.class, patients.get(0).getClass());
 		assertEquals(Organization.class, patients.get(1).getClass());

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirResourceDaoDstu21Test.java

@@ -110,7 +110,7 @@ public class FhirResourceDaoDstu21Test extends BaseJpaDstu21Test {
 		ArrayList<String> retVal = new ArrayList<String>();
 		for (IBaseResource next : theSearch.getResources(0, theSearch.size())) {
 			Patient nextPt = (Patient) next;
-			retVal.add(nextPt.addName().getNameAsSingleString());
+			retVal.add(nextPt.getName().get(0).getNameAsSingleString());
 		}
 		return retVal;
 	}
@@ -2314,17 +2314,17 @@ public class FhirResourceDaoDstu21Test extends BaseJpaDstu21Test {
 		IIdType id2 = myEncounterDao.create(e2).getId().toUnqualifiedVersionless();
 
 		SearchParameterMap pm;
-		List<IIdType> actual;
+		List<String> actual;
 
 		pm = new SearchParameterMap();
 		pm.setSort(new SortSpec(Encounter.SP_LENGTH));
-		actual = toUnqualifiedVersionlessIds(myEncounterDao.search(pm));
-		assertThat(actual, contains(id1, id2, id3));
+		actual = toUnqualifiedVersionlessIdValues(myEncounterDao.search(pm));
+		assertThat(actual, contains(toValues(id1, id2, id3)));
 
 		pm = new SearchParameterMap();
 		pm.setSort(new SortSpec(Encounter.SP_LENGTH, SortOrderEnum.DESC));
-		actual = toUnqualifiedVersionlessIds(myEncounterDao.search(pm));
-		assertThat(actual, contains(id3, id2, id1));
+		actual = toUnqualifiedVersionlessIdValues(myEncounterDao.search(pm));
+		assertThat(actual, contains(toValues(id3, id2, id1)));
 	}
 
 	public void testSortByQuantity() {

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirResourceDaoDstu21UpdateTest.java

@@ -27,14 +27,13 @@ import org.hl7.fhir.dstu21.model.IdType;
 import org.hl7.fhir.dstu21.model.InstantType;
 import org.hl7.fhir.dstu21.model.Organization;
 import org.hl7.fhir.dstu21.model.Patient;
+import org.hl7.fhir.dstu21.model.Resource;
 import org.hl7.fhir.dstu21.model.UriType;
-import org.hl7.fhir.dstu21.model.api.IAnyResource;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.instance.model.api.IIdType;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 
-import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum;
 import ca.uhn.fhir.rest.api.MethodOutcome;
 import ca.uhn.fhir.rest.api.RestOperationTypeEnum;
 import ca.uhn.fhir.rest.param.StringParam;
@@ -60,7 +59,7 @@ public class FhirResourceDaoDstu21UpdateTest extends BaseJpaDstu21Test {
 
 		Date now = new Date();
 		Patient retrieved = myPatientDao.read(outcome.getId());
-		InstantType updated = retrieved.getMeta().getLastUpdatedElement();
+		InstantType updated = retrieved.getMeta().getLastUpdatedElement().copy();
 		assertTrue(updated.before(now));
 
 		Thread.sleep(1000);
@@ -101,11 +100,17 @@ public class FhirResourceDaoDstu21UpdateTest extends BaseJpaDstu21Test {
 		assertEquals(2, historyBundle.size());
 		
 		List<IBaseResource> history = historyBundle.getResources(0, 2);
+		
+		ourLog.info("updated : {}", updated.getValueAsString());
+		ourLog.info("  * Exp : {}", ((Resource) history.get(1)).getMeta().getLastUpdatedElement().getValueAsString());
+		ourLog.info("updated2: {}", updated2.getValueAsString());
+		ourLog.info("  * Exp : {}", ((Resource) history.get(0)).getMeta().getLastUpdatedElement().getValueAsString());
+		
 		assertEquals("1", history.get(1).getIdElement().getVersionIdPart());
 		assertEquals("2", history.get(0).getIdElement().getVersionIdPart());
-		assertEquals(updated.getValue(), ((IAnyResource) history.get(1)).getMeta().getLastUpdated());
+		assertEquals(updated.getValueAsString(), ((Resource) history.get(1)).getMeta().getLastUpdatedElement().getValueAsString());
 		assertEquals("001", ((Patient) history.get(1)).getIdentifier().get(0).getValue());
-		assertEquals(updated2.getValue(), ((IAnyResource) history.get(0)).getMeta().getLastUpdated());
+		assertEquals(updated2.getValueAsString(), ((Resource) history.get(0)).getMeta().getLastUpdatedElement().getValueAsString());
 		assertEquals("002", ((Patient) history.get(0)).getIdentifier().get(0).getValue());
 
 	}

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirResourceDaoDstu21ValidateTest.java

@@ -5,7 +5,6 @@ import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 
 import java.io.IOException;
-import java.util.Arrays;
 
 import org.apache.commons.io.IOUtils;
 import org.hl7.fhir.dstu21.model.Bundle;
@@ -18,9 +17,9 @@ import org.hl7.fhir.dstu21.model.Organization;
 import org.hl7.fhir.dstu21.model.Patient;
 import org.hl7.fhir.dstu21.model.StructureDefinition;
 import org.hl7.fhir.dstu21.model.ValueSet;
-import org.hl7.fhir.instance.model.api.IBaseOperationOutcome;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.instance.model.api.IIdType;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import ca.uhn.fhir.rest.api.MethodOutcome;
@@ -34,6 +33,7 @@ public class FhirResourceDaoDstu21ValidateTest extends BaseJpaDstu21Test {
 	private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(FhirResourceDaoDstu21ValidateTest.class);
 
 	@Test
+	@Ignore
 	public void testValidateResourceContainingProfileDeclarationJson() throws Exception {
 		String methodName = "testValidateResourceContainingProfileDeclarationJson";
 		OperationOutcome outcome = doTestValidateResourceContainingProfileDeclaration(methodName, EncodingEnum.JSON);
@@ -46,6 +46,7 @@ public class FhirResourceDaoDstu21ValidateTest extends BaseJpaDstu21Test {
 	}
 
 	@Test
+	@Ignore
 	public void testValidateResourceContainingProfileDeclarationXml() throws Exception {
 		String methodName = "testValidateResourceContainingProfileDeclarationXml";
 		OperationOutcome outcome = doTestValidateResourceContainingProfileDeclaration(methodName, EncodingEnum.XML);

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirResourceDaoValueSetDstu21Test.java

@@ -19,6 +19,7 @@ import org.hl7.fhir.dstu21.model.UriType;
 import org.hl7.fhir.dstu21.model.ValueSet;
 import org.hl7.fhir.instance.model.api.IIdType;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -190,6 +191,7 @@ public class FhirResourceDaoValueSetDstu21Test extends BaseJpaDstu21Test {
 	}
 	
 	@Test
+	@Ignore
 	public void testExpandByIdentifier() {
 		ValueSet expanded = myValueSetDao.expandByIdentifier("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2", "11378");
 		String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(expanded);

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu21/FhirSystemDaoDstu21Test.java

@@ -301,7 +301,7 @@ public class FhirSystemDaoDstu21Test extends BaseJpaDstu21SystemTest {
 		assertEquals("1", respEntry.getResponse().getEtag());
 
 		o = (Observation) myObservationDao.read(new IdType(respEntry.getResponse().getLocationElement()));
-		assertEquals(id.toVersionless(), o.getSubject().getReference());
+		assertEquals(id.toVersionless().getValue(), o.getSubject().getReference());
 		assertEquals("1", o.getIdElement().getVersionIdPart());
 
 	}
@@ -375,7 +375,7 @@ public class FhirSystemDaoDstu21Test extends BaseJpaDstu21SystemTest {
 		assertEquals("1", respEntry.getResponse().getEtag());
 
 		o = (Observation) myObservationDao.read(new IdType(respEntry.getResponse().getLocationElement()));
-		assertEquals(new IdType(patientId).toUnqualifiedVersionless(), o.getSubject().getReference());
+		assertEquals(new IdType(patientId).toUnqualifiedVersionless().getValue(), o.getSubject().getReference());
 	}
 
 	@Test
@@ -1033,13 +1033,13 @@ public class FhirSystemDaoDstu21Test extends BaseJpaDstu21SystemTest {
 		detailsCapt = ArgumentCaptor.forClass(ActionRequestDetails.class);
 		verify(myInterceptor, times(1)).incomingRequestPreHandled(eq(RestOperationTypeEnum.READ), detailsCapt.capture());
 		details = detailsCapt.getValue();
-		assertEquals(idv1.toUnqualifiedVersionless(), details.getId());
+		assertEquals(idv1.toUnqualifiedVersionless().getValue(), details.getId().getValue());
 		assertEquals("Patient", details.getResourceType());
 
 		detailsCapt = ArgumentCaptor.forClass(ActionRequestDetails.class);
 		verify(myInterceptor, times(1)).incomingRequestPreHandled(eq(RestOperationTypeEnum.VREAD), detailsCapt.capture());
 		details = detailsCapt.getValue();
-		assertEquals(idv1.toUnqualified(), details.getId());
+		assertEquals(idv1.toUnqualified().getValue(), details.getId().getValue());
 		assertEquals("Patient", details.getResourceType());
 
 		detailsCapt = ArgumentCaptor.forClass(ActionRequestDetails.class);
@@ -1195,7 +1195,7 @@ public class FhirSystemDaoDstu21Test extends BaseJpaDstu21SystemTest {
 
 		nextEntry = resp.getEntry().get(1);
 		o = myObservationDao.read(new IdType(nextEntry.getResponse().getLocation()));
-		assertEquals(id.toVersionless(), o.getSubject().getReference());
+		assertEquals(id.toVersionless().getValue(), o.getSubject().getReference());
 
 	}
 
@@ -1267,7 +1267,7 @@ public class FhirSystemDaoDstu21Test extends BaseJpaDstu21SystemTest {
 
 		nextEntry = resp.getEntry().get(1);
 		o = myObservationDao.read(new IdType(nextEntry.getResponse().getLocation()));
-		assertEquals(patientId.toVersionless(), o.getSubject().getReference());
+		assertEquals(patientId.toVersionless().getValue(), o.getSubject().getReference());
 
 	}
 
@@ -1308,7 +1308,7 @@ public class FhirSystemDaoDstu21Test extends BaseJpaDstu21SystemTest {
 		assertEquals(Constants.STATUS_HTTP_201_CREATED + " Created", nextEntry.getResponse().getStatus());
 
 		o = myObservationDao.read(new IdType(resp.getEntry().get(1).getResponse().getLocation()));
-		assertEquals(id.toVersionless(), o.getSubject().getReference());
+		assertEquals(id.toVersionless().getValue(), o.getSubject().getReference());
 
 	}
 

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/BaseResourceProviderDstu21Test.java

@@ -0,0 +1,141 @@
+package ca.uhn.fhir.jpa.provider.dstu21;
+
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.hl7.fhir.dstu21.model.Bundle;
+import org.hl7.fhir.dstu21.model.Bundle.BundleEntryComponent;
+import org.hl7.fhir.dstu21.model.Patient;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
+import org.springframework.web.context.support.GenericWebApplicationContext;
+import org.springframework.web.servlet.DispatcherServlet;
+
+import ca.uhn.fhir.jpa.dao.dstu21.BaseJpaDstu21Test;
+import ca.uhn.fhir.jpa.provider.JpaConformanceProviderDstu2;
+import ca.uhn.fhir.jpa.provider.JpaConformanceProviderDstu21;
+import ca.uhn.fhir.jpa.testutil.RandomServerPortProvider;
+import ca.uhn.fhir.model.api.BundleEntry;
+import ca.uhn.fhir.model.primitive.IdDt;
+import ca.uhn.fhir.narrative.DefaultThymeleafNarrativeGenerator;
+import ca.uhn.fhir.rest.client.IGenericClient;
+import ca.uhn.fhir.rest.client.ServerValidationModeEnum;
+import ca.uhn.fhir.rest.client.interceptor.LoggingInterceptor;
+import ca.uhn.fhir.rest.server.FifoMemoryPagingProvider;
+import ca.uhn.fhir.rest.server.RestfulServer;
+
+public abstract class BaseResourceProviderDstu21Test extends BaseJpaDstu21Test {
+
+	protected static IGenericClient ourClient;
+	protected static CloseableHttpClient ourHttpClient;
+	protected static int ourPort;
+	private static Server ourServer;
+	protected static String ourServerBase;
+
+	public BaseResourceProviderDstu21Test() {
+		super();
+	}
+
+	protected List<String> toNameList(Bundle resp) {
+		List<String> names = new ArrayList<String>();
+		for (BundleEntryComponent next : resp.getEntry()) {
+			Patient nextPt = (Patient) next.getResource();
+			String nextStr = nextPt.getName().size() > 0 ? nextPt.getName().get(0).getGivenAsSingleString() + " " + nextPt.getName().get(0).getFamilyAsSingleString() : "";
+			if (isNotBlank(nextStr)) {
+				names.add(nextStr);
+			}
+		}
+		return names;
+	}
+
+	@AfterClass
+	public static void afterClass() throws Exception {
+		ourServer.stop();
+		ourHttpClient.close();
+		ourServer = null;
+		ourHttpClient = null;
+	}
+
+	@After
+	public void after() {
+		myFhirCtx.getRestfulClientFactory().setServerValidationMode(ServerValidationModeEnum.ONCE);
+	}
+
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	@Before
+	public void before() throws Exception {
+		myFhirCtx.getRestfulClientFactory().setServerValidationMode(ServerValidationModeEnum.NEVER);
+		myFhirCtx.getRestfulClientFactory().setSocketTimeout(1200 * 1000);
+	
+		if (ourServer == null) {
+			ourPort = RandomServerPortProvider.findFreePort();
+	
+			RestfulServer restServer = new RestfulServer(myFhirCtx);
+	
+			ourServerBase = "http://localhost:" + ourPort + "/fhir/context";
+	
+			restServer.setResourceProviders((List)myResourceProviders);
+	
+			restServer.getFhirContext().setNarrativeGenerator(new DefaultThymeleafNarrativeGenerator());
+	
+			restServer.setPlainProviders(mySystemProvider);
+	
+			JpaConformanceProviderDstu21 confProvider = new JpaConformanceProviderDstu21(restServer, mySystemDao, myDaoConfig);
+			confProvider.setImplementationDescription("THIS IS THE DESC");
+			restServer.setServerConformanceProvider(confProvider);
+	
+			restServer.setPagingProvider(new FifoMemoryPagingProvider(10));
+	
+			Server server = new Server(ourPort);
+	
+			ServletContextHandler proxyHandler = new ServletContextHandler();
+			proxyHandler.setContextPath("/");
+	
+			ServletHolder servletHolder = new ServletHolder();
+			servletHolder.setServlet(restServer);
+			proxyHandler.addServlet(servletHolder, "/fhir/context/*");
+	
+			GenericWebApplicationContext webApplicationContext = new GenericWebApplicationContext();
+			webApplicationContext.setParent(myAppCtx);
+			webApplicationContext.refresh();
+//			ContextLoaderListener loaderListener = new ContextLoaderListener(webApplicationContext);
+//			loaderListener.initWebApplicationContext(mock(ServletContext.class));
+//	
+			proxyHandler.getServletContext().setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, webApplicationContext); 
+			
+			DispatcherServlet dispatcherServlet = new DispatcherServlet();
+//			dispatcherServlet.setApplicationContext(webApplicationContext);
+			dispatcherServlet.setContextClass(AnnotationConfigWebApplicationContext.class);
+			ServletHolder subsServletHolder = new ServletHolder();
+			subsServletHolder.setServlet(dispatcherServlet);
+			proxyHandler.addServlet(subsServletHolder, "/*");
+
+			
+			server.setHandler(proxyHandler);
+			server.start();
+	
+			ourClient = myFhirCtx.newRestfulGenericClient(ourServerBase);
+			ourClient.registerInterceptor(new LoggingInterceptor(true));
+	
+			PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager(5000, TimeUnit.MILLISECONDS);
+			HttpClientBuilder builder = HttpClientBuilder.create();
+			builder.setConnectionManager(connectionManager);
+			ourHttpClient = builder.build();
+	
+			ourServer = server;
+		}
+	}
+
+}

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/QuestionnaireResourceProviderDstu21.java

@@ -0,0 +1,15 @@
+package ca.uhn.fhir.jpa.provider.dstu21;
+
+import org.hl7.fhir.dstu21.model.Questionnaire;
+import org.hl7.fhir.instance.model.api.IBaseResource;
+
+import ca.uhn.fhir.jpa.provider.JpaResourceProviderDstu21;
+
+public class QuestionnaireResourceProviderDstu21 extends JpaResourceProviderDstu21<Questionnaire> {
+
+	@Override
+	public Class<? extends IBaseResource> getResourceType() {
+		return Questionnaire.class;
+	}
+
+}

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/ResourceProviderDstu21ValueSetTest.java

@@ -0,0 +1,376 @@
+package ca.uhn.fhir.jpa.provider.dstu21;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.stringContainsInOrder;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+
+import org.hl7.fhir.dstu21.model.BooleanType;
+import org.hl7.fhir.dstu21.model.CodeType;
+import org.hl7.fhir.dstu21.model.Coding;
+import org.hl7.fhir.dstu21.model.Parameters;
+import org.hl7.fhir.dstu21.model.StringType;
+import org.hl7.fhir.dstu21.model.UriType;
+import org.hl7.fhir.dstu21.model.ValueSet;
+import org.hl7.fhir.instance.model.api.IIdType;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.springframework.transaction.annotation.Transactional;
+
+import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
+
+public class ResourceProviderDstu21ValueSetTest extends BaseResourceProviderDstu21Test {
+
+	private IIdType myExtensionalVsId;
+	private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(ResourceProviderDstu21ValueSetTest.class);
+	
+	@Before
+	@Transactional
+	public void before02() throws IOException {
+		ValueSet upload = loadResourceFromClasspath(ValueSet.class, "/extensional-case-2.xml");
+		upload.setId("");
+		myExtensionalVsId = myValueSetDao.create(upload).getId().toUnqualifiedVersionless();
+	}
+	
+	@Test
+	public void testValidateCodeOperationByCodeAndSystemInstance() {
+		//@formatter:off
+		Parameters respParam = ourClient
+			.operation()
+			.onInstance(myExtensionalVsId)
+			.named("validate-code")
+			.withParameter(Parameters.class, "code", new CodeType("8495-4"))
+			.andParameter("system", new UriType("http://loinc.org"))
+			.execute();
+		//@formatter:on
+
+		String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(respParam);
+		ourLog.info(resp);
+		
+		assertEquals(new BooleanType(true), respParam.getParameter().get(0).getValue());
+	}
+
+	@Test
+	public void testValidateCodeOperationByCodeAndSystemType() {
+		//@formatter:off
+		Parameters respParam = ourClient
+			.operation()
+			.onType(ValueSet.class)
+			.named("validate-code")
+			.withParameter(Parameters.class, "code", new CodeType("8450-9"))
+			.andParameter("system", new UriType("http://loinc.org"))
+			.execute();
+		//@formatter:on
+
+		String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(respParam);
+		ourLog.info(resp);
+		
+		assertEquals(new BooleanType(true), respParam.getParameter().get(0).getValue());
+	}
+
+	@Test
+	public void testLookupOperationByCodeAndSystem() {
+		//@formatter:off
+		Parameters respParam = ourClient
+			.operation()
+			.onType(ValueSet.class)
+			.named("lookup")
+			.withParameter(Parameters.class, "code", new CodeType("8450-9"))
+			.andParameter("system", new UriType("http://loinc.org"))
+			.execute();
+		//@formatter:on
+
+		String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(respParam);
+		ourLog.info(resp);
+		
+		assertEquals("name", respParam.getParameter().get(0).getName());
+		assertEquals(new StringType("Unknown"), respParam.getParameter().get(0).getValue());
+		assertEquals("display", respParam.getParameter().get(1).getName());
+		assertEquals(new StringType("Systolic blood pressure--expiration"), respParam.getParameter().get(1).getValue());
+		assertEquals("abstract", respParam.getParameter().get(2).getName());
+		assertEquals(new BooleanType(false), respParam.getParameter().get(2).getValue());
+	}
+	
+	@Test
+	@Ignore
+	public void testLookupOperationForBuiltInCode() {
+		//@formatter:off
+		Parameters respParam = ourClient
+			.operation()
+			.onType(ValueSet.class)
+			.named("lookup")
+			.withParameter(Parameters.class, "code", new CodeType("M"))
+			.andParameter("system", new UriType("http://hl7.org/fhir/v3/MaritalStatus"))
+			.execute();
+		//@formatter:on
+
+		String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(respParam);
+		ourLog.info(resp);
+		
+		assertEquals("name", respParam.getParameter().get(0).getName());
+		assertEquals(new StringType("Unknown"), respParam.getParameter().get(0).getValue());
+		assertEquals("display", respParam.getParameter().get(1).getName());
+		assertEquals(new StringType("Married"), respParam.getParameter().get(1).getValue());
+		assertEquals("abstract", respParam.getParameter().get(2).getName());
+		assertEquals(new BooleanType(false), respParam.getParameter().get(2).getValue());
+	}
+
+	@Test
+	public void testLookupOperationByCoding() {
+		//@formatter:off
+		Parameters respParam = ourClient
+			.operation()
+			.onType(ValueSet.class)
+			.named("lookup")
+			.withParameter(Parameters.class, "coding", new Coding().setSystem("http://loinc.org").setCode("8450-9"))
+			.execute();
+		//@formatter:on
+
+		String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(respParam);
+		ourLog.info(resp);
+		
+		assertEquals("name", respParam.getParameter().get(0).getName());
+		assertEquals(new StringType("Unknown"), respParam.getParameter().get(0).getValue());
+		assertEquals("display", respParam.getParameter().get(1).getName());
+		assertEquals(new StringType("Systolic blood pressure--expiration"), respParam.getParameter().get(1).getValue());
+		assertEquals("abstract", respParam.getParameter().get(2).getName());
+		assertEquals(new BooleanType(false), respParam.getParameter().get(2).getValue());
+	}
+
+	@Test
+	public void testLookupOperationByInvalidCombination() {
+		//@formatter:off
+		try {
+			ourClient
+				.operation()
+				.onType(ValueSet.class)
+				.named("lookup")
+				.withParameter(Parameters.class, "coding", new Coding().setSystem("http://loinc.org").setCode("8450-9"))
+				.andParameter("code", new CodeType("8450-9"))
+				.andParameter("system", new UriType("http://loinc.org"))
+				.execute();
+			fail();
+		} catch (InvalidRequestException e) {
+			assertEquals("HTTP 400 Bad Request: $lookup can only validate (system AND code) OR (coding.system AND coding.code)", e.getMessage());
+		}
+		//@formatter:on
+	}
+
+	@Test
+	public void testLookupOperationByInvalidCombination2() {
+		//@formatter:off
+		try {
+			ourClient
+				.operation()
+				.onType(ValueSet.class)
+				.named("lookup")
+				.withParameter(Parameters.class, "coding", new Coding().setSystem("http://loinc.org").setCode("8450-9"))
+				.andParameter("system", new UriType("http://loinc.org"))
+				.execute();
+			fail();
+		} catch (InvalidRequestException e) {
+			assertEquals("HTTP 400 Bad Request: $lookup can only validate (system AND code) OR (coding.system AND coding.code)", e.getMessage());
+		}
+		//@formatter:on
+	}
+
+	@Test
+	public void testLookupOperationByInvalidCombination3() {
+		//@formatter:off
+		try {
+			ourClient
+				.operation()
+				.onType(ValueSet.class)
+				.named("lookup")
+				.withParameter(Parameters.class, "coding", new Coding().setSystem("http://loinc.org").setCode(null))
+				.execute();
+			fail();
+		} catch (InvalidRequestException e) {
+			assertEquals("HTTP 400 Bad Request: No code, coding, or codeableConcept provided to validate", e.getMessage());
+		}
+		//@formatter:on
+	}
+
+	@Test
+	public void testExpandById() throws IOException {
+		//@formatter:off
+		Parameters respParam = ourClient
+			.operation()
+			.onInstance(myExtensionalVsId)
+			.named("expand")
+			.withNoParameters(Parameters.class)
+			.execute();
+		ValueSet expanded = (ValueSet) respParam.getParameter().get(0).getResource();
+		//@formatter:on
+		
+		String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(expanded);
+		ourLog.info(resp);
+		// @formatter:off
+		assertThat(resp,
+			stringContainsInOrder("<ValueSet xmlns=\"http://hl7.org/fhir\">", 
+				"<expansion>", 
+					"<contains>", 
+						"<system value=\"http://loinc.org\"/>",
+						"<code value=\"11378-7\"/>",
+						"<display value=\"Systolic blood pressure at First encounter\"/>", 
+					"</contains>",
+					"<contains>", 
+						"<system value=\"http://loinc.org\"/>",
+						"<code value=\"8450-9\"/>", 
+						"<display value=\"Systolic blood pressure--expiration\"/>", 
+					"</contains>",
+				"</expansion>" 
+					));
+		//@formatter:on
+
+		/*
+		 * Filter with display name
+		 */
+
+		//@formatter:off
+		respParam = ourClient
+			.operation()
+			.onInstance(myExtensionalVsId)
+			.named("expand")
+			.withParameter(Parameters.class, "filter", new StringType("systolic"))
+			.execute();
+		expanded = (ValueSet) respParam.getParameter().get(0).getResource();
+		//@formatter:on
+
+		expanded = myValueSetDao.expand(myExtensionalVsId, ("systolic"));
+		resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(expanded);
+		ourLog.info(resp);
+		//@formatter:off
+		assertThat(resp, stringContainsInOrder(
+				"<code value=\"11378-7\"/>", 
+				"<display value=\"Systolic blood pressure at First encounter\"/>"));
+		//@formatter:on
+
+		/*
+		 * Filter with code
+		 */
+
+		//@formatter:off
+		respParam = ourClient
+			.operation()
+			.onInstance(myExtensionalVsId)
+			.named("expand")
+			.withParameter(Parameters.class, "filter", new StringType("11378"))
+			.execute();
+		expanded = (ValueSet) respParam.getParameter().get(0).getResource();
+		//@formatter:on
+		resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(expanded);
+		ourLog.info(resp);
+		//@formatter:off
+		assertThat(resp, stringContainsInOrder(
+				"<code value=\"11378-7\"/>", 
+				"<display value=\"Systolic blood pressure at First encounter\"/>"));
+		//@formatter:on
+	}
+	
+	@Test
+	public void testExpandByIdentifier() {
+		//@formatter:off
+		Parameters respParam = ourClient
+			.operation()
+			.onType(ValueSet.class)
+			.named("expand")
+			.withParameter(Parameters.class, "identifier", new UriType("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2"))
+			.andParameter("filter", new StringType("11378"))
+			.execute();
+		ValueSet expanded = (ValueSet) respParam.getParameter().get(0).getResource();
+		//@formatter:on
+
+		String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(expanded);
+		ourLog.info(resp);
+		//@formatter:off
+		assertThat(resp, stringContainsInOrder(
+				"<code value=\"11378-7\"/>", 
+				"<display value=\"Systolic blood pressure at First encounter\"/>"));
+		//@formatter:on
+
+		assertThat(resp, not(containsString("<code value=\"8450-9\"/>")));
+	}
+
+	@Test
+	public void testExpandByValueSet() throws IOException {
+		ValueSet toExpand = loadResourceFromClasspath(ValueSet.class, "/extensional-case-2.xml");
+		
+		//@formatter:off
+		Parameters respParam = ourClient
+			.operation()
+			.onType(ValueSet.class)
+			.named("expand")
+			.withParameter(Parameters.class, "valueSet", toExpand)
+			.andParameter("filter", new StringType("11378"))
+			.execute();
+		ValueSet expanded = (ValueSet) respParam.getParameter().get(0).getResource();
+		//@formatter:on
+
+		String resp = myFhirCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(expanded);
+		ourLog.info(resp);
+		//@formatter:off
+		assertThat(resp, stringContainsInOrder(
+				"<code value=\"11378-7\"/>", 
+				"<display value=\"Systolic blood pressure at First encounter\"/>"));
+		//@formatter:on
+
+		assertThat(resp, not(containsString("<code value=\"8450-9\"/>")));
+	}
+
+	@Test
+	public void testExpandInvalidParams() throws IOException {
+		//@formatter:off
+		try {
+			ourClient
+				.operation()
+				.onType(ValueSet.class)
+				.named("expand")
+				.withNoParameters(Parameters.class)
+				.execute();
+			fail();
+		} catch (InvalidRequestException e) {
+			assertEquals("HTTP 400 Bad Request: $expand operation at the type level (no ID specified) requires an identifier or a valueSet as a part of the request", e.getMessage());
+		}
+		//@formatter:on
+
+		//@formatter:off
+		try {
+			ValueSet toExpand = loadResourceFromClasspath(ValueSet.class, "/extensional-case-2.xml");
+			ourClient
+				.operation()
+				.onType(ValueSet.class)
+				.named("expand")
+				.withParameter(Parameters.class, "valueSet", toExpand)
+				.andParameter("identifier", new UriType("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2"))
+				.execute();
+			fail();
+		} catch (InvalidRequestException e) {
+			assertEquals("HTTP 400 Bad Request: $expand must EITHER be invoked at the type level, or have an identifier specified, or have a ValueSet specified. Can not combine these options.", e.getMessage());
+		}
+		//@formatter:on
+
+		//@formatter:off
+		try {
+			ValueSet toExpand = loadResourceFromClasspath(ValueSet.class, "/extensional-case-2.xml");
+			ourClient
+				.operation()
+				.onInstance(myExtensionalVsId)
+				.named("expand")
+				.withParameter(Parameters.class, "valueSet", toExpand)
+				.andParameter("identifier", new UriType("http://www.healthintersections.com.au/fhir/ValueSet/extensional-case-2"))
+				.execute();
+			fail();
+		} catch (InvalidRequestException e) {
+			assertEquals("HTTP 400 Bad Request: $expand must EITHER be invoked at the type level, or have an identifier specified, or have a ValueSet specified. Can not combine these options.", e.getMessage());
+		}
+		//@formatter:on
+
+	}
+	
+}

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/dstu21/SystemProviderDstu21Test.java

@@ -0,0 +1,426 @@
+package ca.uhn.fhir.jpa.provider.dstu21;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.startsWith;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.InputStream;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.commons.io.IOUtils;
+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.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.hl7.fhir.dstu21.model.Bundle;
+import org.hl7.fhir.dstu21.model.Bundle.BundleType;
+import org.hl7.fhir.dstu21.model.Bundle.HTTPVerb;
+import org.hl7.fhir.dstu21.model.DecimalType;
+import org.hl7.fhir.dstu21.model.IdType;
+import org.hl7.fhir.dstu21.model.Observation;
+import org.hl7.fhir.dstu21.model.OperationDefinition;
+import org.hl7.fhir.dstu21.model.OperationOutcome;
+import org.hl7.fhir.dstu21.model.Parameters;
+import org.hl7.fhir.dstu21.model.Patient;
+import org.hl7.fhir.dstu21.model.StringType;
+import org.hl7.fhir.instance.model.api.IIdType;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import ca.uhn.fhir.context.FhirContext;
+import ca.uhn.fhir.jpa.dao.dstu21.BaseJpaDstu21Test;
+import ca.uhn.fhir.jpa.rp.dstu21.ObservationResourceProvider;
+import ca.uhn.fhir.jpa.rp.dstu21.OrganizationResourceProvider;
+import ca.uhn.fhir.jpa.rp.dstu21.PatientResourceProvider;
+import ca.uhn.fhir.jpa.testutil.RandomServerPortProvider;
+import ca.uhn.fhir.rest.client.IGenericClient;
+import ca.uhn.fhir.rest.server.EncodingEnum;
+import ca.uhn.fhir.rest.server.FifoMemoryPagingProvider;
+import ca.uhn.fhir.rest.server.RestfulServer;
+import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
+import ca.uhn.fhir.rest.server.interceptor.ResponseHighlighterInterceptor;
+
+public class SystemProviderDstu21Test extends BaseJpaDstu21Test {
+
+	private static RestfulServer myRestServer;
+	private static IGenericClient ourClient;
+	private static FhirContext ourCtx;
+	private static CloseableHttpClient ourHttpClient;
+	private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(SystemProviderDstu21Test.class);
+	private static Server ourServer;
+	private static String ourServerBase;
+
+	@Before
+	public void beforeStartServer() throws Exception {
+		if (myRestServer == null) {
+			PatientResourceProvider patientRp = new PatientResourceProvider();
+			patientRp.setDao(myPatientDao);
+
+			QuestionnaireResourceProviderDstu21 questionnaireRp = new QuestionnaireResourceProviderDstu21();
+			questionnaireRp.setDao(myQuestionnaireDao);
+
+			ObservationResourceProvider observationRp = new ObservationResourceProvider();
+			observationRp.setDao(myObservationDao);
+
+			OrganizationResourceProvider organizationRp = new OrganizationResourceProvider();
+			organizationRp.setDao(myOrganizationDao);
+
+			RestfulServer restServer = new RestfulServer(ourCtx);
+			restServer.setPagingProvider(new FifoMemoryPagingProvider(10).setDefaultPageSize(10));
+			restServer.setResourceProviders(patientRp, questionnaireRp, observationRp, organizationRp);
+
+			restServer.setPlainProviders(mySystemProvider);
+
+			int myPort = RandomServerPortProvider.findFreePort();
+			ourServer = new Server(myPort);
+
+			ServletContextHandler proxyHandler = new ServletContextHandler();
+			proxyHandler.setContextPath("/");
+
+			ourServerBase = "http://localhost:" + myPort + "/fhir/context";
+
+			ServletHolder servletHolder = new ServletHolder();
+			servletHolder.setServlet(restServer);
+			proxyHandler.addServlet(servletHolder, "/fhir/context/*");
+
+			ourCtx = FhirContext.forDstu2();
+			restServer.setFhirContext(ourCtx);
+
+			ourServer.setHandler(proxyHandler);
+			ourServer.start();
+
+			PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager(5000, TimeUnit.MILLISECONDS);
+			HttpClientBuilder builder = HttpClientBuilder.create();
+			builder.setConnectionManager(connectionManager);
+			ourHttpClient = builder.build();
+
+			ourCtx.getRestfulClientFactory().setSocketTimeout(600 * 1000);
+			ourClient = ourCtx.newRestfulGenericClient(ourServerBase);
+			ourClient.setLogRequestAndResponse(true);
+			myRestServer = restServer;
+		}
+	}
+
+	@Test
+	public void testEverythingReturnsCorrectFormatInPagingLink() throws Exception {
+		myRestServer.setDefaultResponseEncoding(EncodingEnum.JSON);
+		myRestServer.setPagingProvider(new FifoMemoryPagingProvider(1).setDefaultPageSize(10));
+		ResponseHighlighterInterceptor interceptor = new ResponseHighlighterInterceptor();
+		myRestServer.registerInterceptor(interceptor);
+
+		for (int i = 0; i < 11; i++) {
+			Patient p = new Patient();
+			p.addName().addFamily("Name" + i);
+			ourClient.create().resource(p).execute();
+		}
+
+		HttpGet get = new HttpGet(ourServerBase + "/Patient/$everything");
+		get.addHeader("Accept", "application/xml, text/html");
+		CloseableHttpResponse http = ourHttpClient.execute(get);
+		try {
+			String response = IOUtils.toString(http.getEntity().getContent());
+			ourLog.info(response);
+			assertThat(response, not(containsString("_format")));
+			assertEquals(200, http.getStatusLine().getStatusCode());
+		} finally {
+			http.close();
+		}
+
+		myRestServer.unregisterInterceptor(interceptor);
+	}
+
+	@Test
+	public void testEverythingReturnsCorrectBundleType() throws Exception {
+		myRestServer.setDefaultResponseEncoding(EncodingEnum.JSON);
+		myRestServer.setPagingProvider(new FifoMemoryPagingProvider(1).setDefaultPageSize(10));
+		ResponseHighlighterInterceptor interceptor = new ResponseHighlighterInterceptor();
+		myRestServer.registerInterceptor(interceptor);
+
+		for (int i = 0; i < 11; i++) {
+			Patient p = new Patient();
+			p.addName().addFamily("Name" + i);
+			ourClient.create().resource(p).execute();
+		}
+
+		HttpGet get = new HttpGet(ourServerBase + "/Patient/$everything");
+		get.addHeader("Accept", "application/xml+fhir");
+		CloseableHttpResponse http = ourHttpClient.execute(get);
+		try {
+			String response = IOUtils.toString(http.getEntity().getContent());
+			ourLog.info(response);
+			assertThat(response, not(containsString("_format")));
+			assertEquals(200, http.getStatusLine().getStatusCode());
+			
+			Bundle responseBundle = ourCtx.newXmlParser().parseResource(Bundle.class, response);
+			assertEquals(BundleType.COLLECTION, responseBundle.getTypeElement().getValue());
+			
+		} finally {
+			http.close();
+		}
+
+		myRestServer.unregisterInterceptor(interceptor);
+	}
+
+	@Test
+	public void testEverythingType() throws Exception {
+		HttpGet get = new HttpGet(ourServerBase + "/Patient/$everything");
+		CloseableHttpResponse http = ourHttpClient.execute(get);
+		try {
+			assertEquals(200, http.getStatusLine().getStatusCode());
+		} finally {
+			http.close();
+		}
+	}
+
+	@Transactional(propagation=Propagation.NEVER)
+	@Test
+	public void testSuggestKeywords() throws Exception {
+		
+		Patient patient = new Patient();
+		patient.addName().addFamily("testSuggest");
+		IIdType ptId = myPatientDao.create(patient).getId().toUnqualifiedVersionless();
+
+		Observation obs = new Observation();
+		obs.getCode().setText("ZXCVBNM ASDFGHJKL QWERTYUIOPASDFGHJKL");
+		obs.getSubject().setReferenceElement(ptId);
+		IIdType obsId = myObservationDao.create(obs).getId().toUnqualifiedVersionless();
+
+		obs = new Observation();
+		obs.setId(obsId);
+		obs.getSubject().setReferenceElement(ptId);
+		obs.getCode().setText("ZXCVBNM ASDFGHJKL QWERTYUIOPASDFGHJKL");
+		myObservationDao.update(obs);
+		
+		HttpGet get = new HttpGet(ourServerBase + "/$suggest-keywords?context=Patient/" + ptId.getIdPart() + "/$everything&searchParam=_content&text=zxc&_pretty=true&_format=xml");
+		CloseableHttpResponse http = ourHttpClient.execute(get);
+		try {
+			assertEquals(200, http.getStatusLine().getStatusCode());
+			String output = IOUtils.toString(http.getEntity().getContent());
+			ourLog.info(output);
+			
+			Parameters parameters = ourCtx.newXmlParser().parseResource(Parameters.class, output);
+			assertEquals(2, parameters.getParameter().size());
+			assertEquals("keyword", parameters.getParameter().get(0).getPart().get(0).getName());
+			assertEquals(new StringType("ZXCVBNM"), parameters.getParameter().get(0).getPart().get(0).getValue());
+			assertEquals("score", parameters.getParameter().get(0).getPart().get(1).getName());
+			assertEquals(new DecimalType("1.0"), parameters.getParameter().get(0).getPart().get(1).getValue());
+			
+		} finally {
+			http.close();
+		}
+	}
+
+	@Test
+	public void testSuggestKeywordsInvalid() throws Exception {
+		Patient patient = new Patient();
+		patient.addName().addFamily("testSuggest");
+		IIdType ptId = myPatientDao.create(patient).getId().toUnqualifiedVersionless();
+
+		Observation obs = new Observation();
+		obs.getSubject().setReferenceElement(ptId);
+		obs.getCode().setText("ZXCVBNM ASDFGHJKL QWERTYUIOPASDFGHJKL");
+		myObservationDao.create(obs);
+		
+		HttpGet get = new HttpGet(ourServerBase + "/$suggest-keywords");
+		CloseableHttpResponse http = ourHttpClient.execute(get);
+		try {
+			assertEquals(400, http.getStatusLine().getStatusCode());
+			String output = IOUtils.toString(http.getEntity().getContent());
+			ourLog.info(output);
+			assertThat(output, containsString("Parameter 'context' must be provided"));
+		} finally {
+			http.close();
+		}
+		
+		get = new HttpGet(ourServerBase + "/$suggest-keywords?context=Patient/" + ptId.getIdPart() + "/$everything");
+		http = ourHttpClient.execute(get);
+		try {
+			assertEquals(400, http.getStatusLine().getStatusCode());
+			String output = IOUtils.toString(http.getEntity().getContent());
+			ourLog.info(output);
+			assertThat(output, containsString("Parameter 'searchParam' must be provided"));
+		} finally {
+			http.close();
+		}
+
+		get = new HttpGet(ourServerBase + "/$suggest-keywords?context=Patient/" + ptId.getIdPart() + "/$everything&searchParam=aa");
+		http = ourHttpClient.execute(get);
+		try {
+			assertEquals(400, http.getStatusLine().getStatusCode());
+			String output = IOUtils.toString(http.getEntity().getContent());
+			ourLog.info(output);
+			assertThat(output, containsString("Parameter 'text' must be provided"));
+		} finally {
+			http.close();
+		}
+
+	}
+
+	@Test
+	public void testGetOperationDefinition() {
+		OperationDefinition op = ourClient.read(OperationDefinition.class, "get-resource-counts");
+		assertEquals("$get-resource-counts", op.getCode());
+	}
+
+	@Test
+	public void testTransactionFromBundle() throws Exception {
+		InputStream bundleRes = SystemProviderDstu21Test.class.getResourceAsStream("/transaction_link_patient_eve.xml");
+		String bundle = IOUtils.toString(bundleRes);
+		String response = ourClient.transaction().withBundle(bundle).prettyPrint().execute();
+		ourLog.info(response);
+	}
+
+	@Test
+	public void testTransactionFromBundle2() throws Exception {
+
+		InputStream bundleRes = SystemProviderDstu21Test.class.getResourceAsStream("/transaction_link_patient_eve_temp.xml");
+		String bundle = IOUtils.toString(bundleRes);
+		String response = ourClient.transaction().withBundle(bundle).prettyPrint().execute();
+		ourLog.info(response);
+
+		Bundle resp = ourCtx.newXmlParser().parseResource(Bundle.class, response);
+		IdType id1_1 = new IdType(resp.getEntry().get(0).getResponse().getLocation());
+		assertEquals("Provenance", id1_1.getResourceType());
+		IdType id1_2 = new IdType(resp.getEntry().get(1).getResponse().getLocation());
+		IdType id1_3 = new IdType(resp.getEntry().get(2).getResponse().getLocation());
+		IdType id1_4 = new IdType(resp.getEntry().get(3).getResponse().getLocation());
+
+		/*
+		 * Same bundle!
+		 */
+
+		bundleRes = SystemProviderDstu21Test.class.getResourceAsStream("/transaction_link_patient_eve_temp.xml");
+		bundle = IOUtils.toString(bundleRes);
+		response = ourClient.transaction().withBundle(bundle).prettyPrint().execute();
+		ourLog.info(response);
+
+		resp = ourCtx.newXmlParser().parseResource(Bundle.class, response);
+		IdType id2_1 = new IdType(resp.getEntry().get(0).getResponse().getLocation());
+		IdType id2_2 = new IdType(resp.getEntry().get(1).getResponse().getLocation());
+		IdType id2_3 = new IdType(resp.getEntry().get(2).getResponse().getLocation());
+		IdType id2_4 = new IdType(resp.getEntry().get(3).getResponse().getLocation());
+
+		assertNotEquals(id1_1.toVersionless(), id2_1.toVersionless());
+		assertEquals("Provenance", id2_1.getResourceType());
+		assertEquals(id1_2.toVersionless(), id2_2.toVersionless());
+		assertEquals(id1_3.toVersionless(), id2_3.toVersionless());
+		assertEquals(id1_4.toVersionless(), id2_4.toVersionless());
+	}
+
+	/**
+	 * This is Gramahe's test transaction - it requires some set up in order to work
+	 */
+	// @Test
+	public void testTransactionFromBundle3() throws Exception {
+
+		InputStream bundleRes = SystemProviderDstu21Test.class.getResourceAsStream("/grahame-transaction.xml");
+		String bundle = IOUtils.toString(bundleRes);
+		String response = ourClient.transaction().withBundle(bundle).prettyPrint().execute();
+		ourLog.info(response);
+	}
+
+	@Test
+	public void testTransactionFromBundle4() throws Exception {
+		InputStream bundleRes = SystemProviderDstu21Test.class.getResourceAsStream("/simone_bundle.xml");
+		String bundle = IOUtils.toString(bundleRes);
+		String response = ourClient.transaction().withBundle(bundle).prettyPrint().execute();
+		ourLog.info(response);
+		Bundle bundleResp = ourCtx.newXmlParser().parseResource(Bundle.class, response);
+		IdType id = new IdType(bundleResp.getEntry().get(0).getResponse().getLocation());
+		assertEquals("Patient", id.getResourceType());
+		assertTrue(id.hasIdPart());
+		assertTrue(id.isIdPartValidLong());
+		assertTrue(id.hasVersionIdPart());
+		assertTrue(id.isVersionIdPartValidLong());
+	}
+
+	@Test
+	public void testTransactionFromBundle5() throws Exception {
+		InputStream bundleRes = SystemProviderDstu21Test.class.getResourceAsStream("/simone_bundle2.xml");
+		String bundle = IOUtils.toString(bundleRes);
+		try {
+			ourClient.transaction().withBundle(bundle).prettyPrint().execute();
+			fail();
+		} catch (InvalidRequestException e) {
+			OperationOutcome oo = (OperationOutcome) e.getOperationOutcome();
+			assertEquals("Invalid placeholder ID found: uri:uuid:bb0cd4bc-1839-4606-8c46-ba3069e69b1d - Must be of the form 'urn:uuid:[uuid]' or 'urn:oid:[oid]'", oo.getIssue().get(0).getDiagnostics());
+			assertEquals("processing", oo.getIssue().get(0).getCode());
+		}
+	}
+
+	@Test
+	public void testTransactionFromBundle6() throws Exception {
+		InputStream bundleRes = SystemProviderDstu21Test.class.getResourceAsStream("/simone_bundle3.xml");
+		String bundle = IOUtils.toString(bundleRes);
+		ourClient.transaction().withBundle(bundle).prettyPrint().execute();
+		// try {
+		// fail();
+		// } catch (InvalidRequestException e) {
+		// OperationOutcome oo = (OperationOutcome) e.getOperationOutcome();
+		// assertEquals("Invalid placeholder ID found: uri:uuid:bb0cd4bc-1839-4606-8c46-ba3069e69b1d - Must be of the form 'urn:uuid:[uuid]' or 'urn:oid:[oid]'", oo.getIssue().get(0).getDiagnostics());
+		// assertEquals("processing", oo.getIssue().get(0).getCode());
+		// }
+	}
+
+	@Test
+	public void testTransactionSearch() throws Exception {
+		for (int i = 0; i < 20; i ++) {
+			Patient p = new Patient();
+			p.addName().addFamily("PATIENT_" + i);
+			myPatientDao.create(p);
+		}
+		
+		Bundle req = new Bundle();
+		req.setType(BundleType.TRANSACTION);
+		req.addEntry().getRequest().setMethod(HTTPVerb.GET).setUrl("Patient?");
+		Bundle resp = ourClient.transaction().withBundle(req).execute();
+		ourLog.info(ourCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(resp));
+		
+		assertEquals(1, resp.getEntry().size());
+		Bundle respSub = (Bundle)resp.getEntry().get(0).getResource();
+		assertEquals("self", respSub.getLink().get(0).getRelation());
+		assertEquals(ourServerBase + "/Patient", respSub.getLink().get(0).getUrl());
+		assertEquals("next", respSub.getLink().get(1).getRelation());
+		assertThat(respSub.getLink().get(1).getUrl(), containsString("/fhir/context?_getpages"));
+		assertThat(respSub.getEntry().get(0).getFullUrl(), startsWith(ourServerBase + "/Patient/"));
+		assertEquals(Patient.class, respSub.getEntry().get(0).getResource().getClass());
+	}
+
+	@Test
+	public void testTransactionCount() throws Exception {
+		for (int i = 0; i < 20; i ++) {
+			Patient p = new Patient();
+			p.addName().addFamily("PATIENT_" + i);
+			myPatientDao.create(p);
+		}
+		
+		Bundle req = new Bundle();
+		req.setType(BundleType.TRANSACTION);
+		req.addEntry().getRequest().setMethod(HTTPVerb.GET).setUrl("Patient?_summary=count");
+		Bundle resp = ourClient.transaction().withBundle(req).execute();
+		ourLog.info(ourCtx.newXmlParser().setPrettyPrint(true).encodeResourceToString(resp));
+		
+		assertEquals(1, resp.getEntry().size());
+		Bundle respSub = (Bundle)resp.getEntry().get(0).getResource();
+		assertEquals(20, respSub.getTotal());
+		assertEquals(0, respSub.getEntry().size());
+	}
+
+	@AfterClass
+	public static void afterClass() throws Exception {
+		ourServer.stop();
+	}
+
+}

hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/FhirDstu1.java

@@ -35,6 +35,7 @@ import java.util.Map;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.text.WordUtils;
 import org.hl7.fhir.instance.model.api.IBaseResource;
+import org.hl7.fhir.instance.model.api.IIdType;
 import org.hl7.fhir.instance.model.api.IPrimitiveType;
 
 import ca.uhn.fhir.context.BaseRuntimeChildDefinition;
@@ -398,4 +399,10 @@ public class FhirDstu1 implements IFhirVersion {
 		return theExtensionDefToCode;
 	}
 
+	@Override
+	public IIdType newIdType() {
+		return new IdDt();
+	}
+
+
 }

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/ctx/FhirDstu21.java

@@ -29,11 +29,15 @@ import org.hl7.fhir.dstu21.hapi.rest.server.Dstu21BundleFactory;
 import org.hl7.fhir.dstu21.hapi.rest.server.ServerConformanceProvider;
 import org.hl7.fhir.dstu21.hapi.rest.server.ServerProfileProvider;
 import org.hl7.fhir.dstu21.model.Coding;
+import org.hl7.fhir.dstu21.model.IdType;
 import org.hl7.fhir.dstu21.model.Reference;
+import org.hl7.fhir.dstu21.model.Resource;
 import org.hl7.fhir.dstu21.model.StructureDefinition;
+import org.hl7.fhir.instance.model.api.IAnyResource;
 import org.hl7.fhir.instance.model.api.IBaseCoding;
 import org.hl7.fhir.instance.model.api.IBaseReference;
 import org.hl7.fhir.instance.model.api.IBaseResource;
+import org.hl7.fhir.instance.model.api.IIdType;
 import org.hl7.fhir.instance.model.api.IPrimitiveType;
 
 import ca.uhn.fhir.context.ConfigurationException;
@@ -98,7 +102,7 @@ public class FhirDstu21 implements IFhirVersion {
 
 	@Override
 	public IPrimitiveType<Date> getLastUpdated(IBaseResource theResource) {
-		return ResourceMetadataKeyEnum.UPDATED.get((IResource) theResource);
+		return ((Resource) theResource).getMeta().getLastUpdatedElement();
 	}
 
 	@Override
@@ -126,4 +130,9 @@ public class FhirDstu21 implements IFhirVersion {
 		return new Coding();
 	}
 
+	@Override
+	public IIdType newIdType() {
+		return new IdType();
+	}
+
 }

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/hapi/rest/server/Dstu21BundleFactory.java

@@ -29,15 +29,14 @@ import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 import org.hl7.fhir.dstu21.model.Bundle;
-import org.hl7.fhir.dstu21.model.DomainResource;
 import org.hl7.fhir.dstu21.model.Bundle.BundleEntryComponent;
 import org.hl7.fhir.dstu21.model.Bundle.BundleLinkComponent;
-import org.hl7.fhir.dstu21.model.Bundle.BundleType;
 import org.hl7.fhir.dstu21.model.Bundle.HTTPVerb;
 import org.hl7.fhir.dstu21.model.Bundle.SearchEntryMode;
+import org.hl7.fhir.dstu21.model.DomainResource;
+import org.hl7.fhir.dstu21.model.IdType;
 import org.hl7.fhir.dstu21.model.Resource;
 import org.hl7.fhir.instance.model.api.IAnyResource;
 import org.hl7.fhir.instance.model.api.IBaseResource;
@@ -46,14 +45,10 @@ import org.hl7.fhir.instance.model.api.IPrimitiveType;
 
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.context.RuntimeResourceDefinition;
-import ca.uhn.fhir.model.api.IResource;
 import ca.uhn.fhir.model.api.Include;
 import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum;
 import ca.uhn.fhir.model.base.composite.BaseResourceReferenceDt;
 import ca.uhn.fhir.model.base.resource.BaseOperationOutcome;
-import ca.uhn.fhir.model.primitive.IdDt;
-import ca.uhn.fhir.model.primitive.InstantDt;
-import ca.uhn.fhir.model.valueset.BundleEntrySearchModeEnum;
 import ca.uhn.fhir.model.valueset.BundleEntryTransactionMethodEnum;
 import ca.uhn.fhir.model.valueset.BundleTypeEnum;
 import ca.uhn.fhir.rest.server.AddProfileTagEnum;
@@ -94,26 +89,26 @@ public class Dstu21BundleFactory implements IVersionSpecificBundleFactory {
 			Set<String> containedIds = new HashSet<String>();
 			if (next instanceof DomainResource) {
 				for (Resource nextContained : ((DomainResource)next).getContained()) {
-					if (nextContained.getId().isEmpty() == false) {
-						containedIds.add(nextContained.getId());
+					if (nextContained.getIdElement().isEmpty() == false) {
+						containedIds.add(nextContained.getIdElement().getValue());
 					}
 				}
 			}
 			
 			List<BaseResourceReferenceDt> references = myContext.newTerser().getAllPopulatedChildElementsOfType(next, BaseResourceReferenceDt.class);
 			do {
-				List<IResource> addedResourcesThisPass = new ArrayList<IResource>();
+				List<IAnyResource> addedResourcesThisPass = new ArrayList<IAnyResource>();
 
 				for (BaseResourceReferenceDt nextRef : references) {
-					IResource nextRes = (IResource) nextRef.getResource();
+					IAnyResource nextRes = (IAnyResource) nextRef.getResource();
 					if (nextRes != null) {
-						if (nextRes.getId().hasIdPart()) {
-							if (containedIds.contains(nextRes.getId().getValue())) {
+						if (nextRes.getIdElement().hasIdPart()) {
+							if (containedIds.contains(nextRes.getIdElement().getValue())) {
 								// Don't add contained IDs as top level resources
 								continue;
 							}
 
-							IdDt id = nextRes.getId();
+							IIdType id = nextRes.getIdElement();
 							if (id.hasResourceType() == false) {
 								String resName = myContext.getResourceDefinition(nextRes).getName();
 								id = id.withResourceType(resName);
@@ -130,7 +125,7 @@ public class Dstu21BundleFactory implements IVersionSpecificBundleFactory {
 
 				// Linked resources may themselves have linked resources
 				references = new ArrayList<BaseResourceReferenceDt>();
-				for (IResource iResource : addedResourcesThisPass) {
+				for (IAnyResource iResource : addedResourcesThisPass) {
 					List<BaseResourceReferenceDt> newReferences = myContext.newTerser().getAllPopulatedChildElementsOfType(iResource, BaseResourceReferenceDt.class);
 					references.addAll(newReferences);
 				}
@@ -144,9 +139,9 @@ public class Dstu21BundleFactory implements IVersionSpecificBundleFactory {
 				entry.setFullUrl(next.getId());
 			}
 
-			BundleEntryTransactionMethodEnum httpVerb = (BundleEntryTransactionMethodEnum) next.getUserData(ResourceMetadataKeyEnum.ENTRY_TRANSACTION_METHOD.name());
+			String httpVerb = ResourceMetadataKeyEnum.ENTRY_TRANSACTION_METHOD.get(next);
 			if (httpVerb != null) {
-				entry.getRequest().getMethodElement().setValueAsString(httpVerb.getCode());
+				entry.getRequest().getMethodElement().setValueAsString(httpVerb);
 			}
 		}
 
@@ -168,12 +163,12 @@ public class Dstu21BundleFactory implements IVersionSpecificBundleFactory {
 			myBundle = new Bundle();
 		}
 
-		List<IResource> includedResources = new ArrayList<IResource>();
-		Set<IdDt> addedResourceIds = new HashSet<IdDt>();
+		List<IAnyResource> includedResources = new ArrayList<IAnyResource>();
+		Set<IIdType> addedResourceIds = new HashSet<IIdType>();
 
 		for (IBaseResource next : theResult) {
 			if (next.getIdElement().isEmpty() == false) {
-				addedResourceIds.add((IdDt) next.getIdElement());
+				addedResourceIds.add((IdType) next.getIdElement());
 			}
 		}
 
@@ -191,21 +186,21 @@ public class Dstu21BundleFactory implements IVersionSpecificBundleFactory {
 
 			List<ResourceReferenceInfo> references = myContext.newTerser().getAllResourceReferences(next);
 			do {
-				List<IResource> addedResourcesThisPass = new ArrayList<IResource>();
+				List<IAnyResource> addedResourcesThisPass = new ArrayList<IAnyResource>();
 
 				for (ResourceReferenceInfo nextRefInfo : references) {
 					if (!theBundleInclusionRule.shouldIncludeReferencedResource(nextRefInfo, theIncludes))
 						continue;
 
-					IResource nextRes = (IResource) nextRefInfo.getResourceReference().getResource();
+					IAnyResource nextRes = (IAnyResource) nextRefInfo.getResourceReference().getResource();
 					if (nextRes != null) {
-						if (nextRes.getId().hasIdPart()) {
-							if (containedIds.contains(nextRes.getId().getValue())) {
+						if (nextRes.getIdElement().hasIdPart()) {
+							if (containedIds.contains(nextRes.getIdElement().getValue())) {
 								// Don't add contained IDs as top level resources
 								continue;
 							}
 
-							IdDt id = nextRes.getId();
+							IIdType id = nextRes.getIdElement();
 							if (id.hasResourceType() == false) {
 								String resName = myContext.getResourceDefinition(nextRes).getName();
 								id = id.withResourceType(resName);
@@ -224,7 +219,7 @@ public class Dstu21BundleFactory implements IVersionSpecificBundleFactory {
 
 				// Linked resources may themselves have linked resources
 				references = new ArrayList<ResourceReferenceInfo>();
-				for (IResource iResource : addedResourcesThisPass) {
+				for (IAnyResource iResource : addedResourcesThisPass) {
 					List<ResourceReferenceInfo> newReferences = myContext.newTerser().getAllResourceReferences(iResource);
 					references.addAll(newReferences);
 				}
@@ -232,22 +227,22 @@ public class Dstu21BundleFactory implements IVersionSpecificBundleFactory {
 
 			BundleEntryComponent entry = myBundle.addEntry().setResource((Resource) next);
 			Resource nextAsResource = (Resource)next;
-			BundleEntryTransactionMethodEnum httpVerb = (BundleEntryTransactionMethodEnum) nextAsResource.getUserData(ResourceMetadataKeyEnum.ENTRY_TRANSACTION_METHOD.name());
+			String httpVerb = ResourceMetadataKeyEnum.ENTRY_TRANSACTION_METHOD.get(nextAsResource);
 			if (httpVerb != null) {
-				entry.getRequest().getMethodElement().setValueAsString(httpVerb.getCode());
+				entry.getRequest().getMethodElement().setValueAsString(httpVerb);
 			}
 			populateBundleEntryFullUrl(next, entry);
 			
-			BundleEntrySearchModeEnum searchMode = (BundleEntrySearchModeEnum) nextAsResource.getUserData(ResourceMetadataKeyEnum.ENTRY_SEARCH_MODE.name());
+			String searchMode = ResourceMetadataKeyEnum.ENTRY_SEARCH_MODE.get(nextAsResource);
 			if (searchMode != null) {
-				entry.getSearch().getModeElement().setValueAsString(searchMode.getCode());
+				entry.getSearch().getModeElement().setValueAsString(searchMode);
 			}
 		}
 
 		/*
 		 * Actually add the resources to the bundle
 		 */
-		for (IResource next : includedResources) {
+		for (IAnyResource next : includedResources) {
 			BundleEntryComponent entry = myBundle.addEntry();
 			entry.setResource((Resource) next).getSearch().setMode(SearchEntryMode.INCLUDE);
 			populateBundleEntryFullUrl(next, entry);
@@ -272,7 +267,7 @@ public class Dstu21BundleFactory implements IVersionSpecificBundleFactory {
 
 		myBase = theServerBase;
 		
-		if (myBundle.getId().isEmpty()) {
+		if (myBundle.getIdElement().isEmpty()) {
 			myBundle.setId(UUID.randomUUID().toString());
 		}
 
@@ -413,7 +408,7 @@ public class Dstu21BundleFactory implements IVersionSpecificBundleFactory {
 				BundleEntryComponent nextEntry = myBundle.addEntry();
 
 				nextEntry.setResource((Resource) next);
-				if (next.getId().isEmpty()) {
+				if (next.getIdElement().isEmpty()) {
 					nextEntry.getRequest().setMethod(HTTPVerb.POST);
 				} else {
 					nextEntry.getRequest().setMethod(HTTPVerb.PUT);
@@ -421,7 +416,7 @@ public class Dstu21BundleFactory implements IVersionSpecificBundleFactory {
 						nextEntry.getRequest().setUrl(next.getId());
 					} else {
 						String resourceType = myContext.getResourceDefinition(next).getName();
-						nextEntry.getRequest().setUrl(new IdDt(theServerBase, resourceType, next.getIdElement().getIdPart(), next.getIdElement().getVersionIdPart()).getValue());
+						nextEntry.getRequest().setUrl(new IdType(theServerBase, resourceType, next.getIdElement().getIdPart(), next.getIdElement().getVersionIdPart()).getValue());
 					}
 				}
 			}
@@ -444,10 +439,10 @@ public class Dstu21BundleFactory implements IVersionSpecificBundleFactory {
 			if (next.getResource() != null) {
 				retVal.add(next.getResource());
 			} else if (next.getResponse().getLocationElement().isEmpty() == false) {
-				IdDt id = new IdDt(next.getResponse().getLocation());
+				IdType id = new IdType(next.getResponse().getLocation());
 				String resourceType = id.getResourceType();
 				if (isNotBlank(resourceType)) {
-					IResource res = (IResource) myContext.getResourceDefinition(resourceType).newInstance();
+					IAnyResource res = (IAnyResource) myContext.getResourceDefinition(resourceType).newInstance();
 					res.setId(id);
 					retVal.add(res);
 				}

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Account.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -777,42 +777,204 @@ public class Account extends DomainResource {
     return ResourceType.Account;
    }
 
+ /**
+   * Search parameter: <b>owner</b>
+   * <p>
+   * Description: <b>Who is responsible?</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Account.owner</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="owner", path="Account.owner", description="Who is responsible?", type="reference" )
   public static final String SP_OWNER = "owner";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>owner</b>
+   * <p>
+   * Description: <b>Who is responsible?</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Account.owner</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam OWNER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_OWNER);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Account:owner</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_OWNER = new ca.uhn.fhir.model.api.Include("Account:owner").toLocked();
 
+ /**
+   * Search parameter: <b>identifier</b>
+   * <p>
+   * Description: <b>Account number</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Account.identifier</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="identifier", path="Account.identifier", description="Account number", type="token" )
   public static final String SP_IDENTIFIER = "identifier";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>identifier</b>
+   * <p>
+   * Description: <b>Account number</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Account.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
+
+ /**
+   * Search parameter: <b>period</b>
+   * <p>
+   * Description: <b>Transaction window</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>Account.coveragePeriod</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="period", path="Account.coveragePeriod", description="Transaction window", type="date" )
   public static final String SP_PERIOD = "period";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>period</b>
+   * <p>
+   * Description: <b>Transaction window</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>Account.coveragePeriod</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam PERIOD = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_PERIOD);
+
+ /**
+   * Search parameter: <b>balance</b>
+   * <p>
+   * Description: <b>How much is in account?</b><br>
+   * Type: <b>quantity</b><br>
+   * Path: <b>Account.balance</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="balance", path="Account.balance", description="How much is in account?", type="quantity" )
   public static final String SP_BALANCE = "balance";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>balance</b>
+   * <p>
+   * Description: <b>How much is in account?</b><br>
+   * Type: <b>quantity</b><br>
+   * Path: <b>Account.balance</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.QuantityClientParam BALANCE = new ca.uhn.fhir.rest.gclient.QuantityClientParam(SP_BALANCE);
+
+ /**
+   * Search parameter: <b>subject</b>
+   * <p>
+   * Description: <b>What is account tied to?</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Account.subject</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="subject", path="Account.subject", description="What is account tied to?", type="reference" )
   public static final String SP_SUBJECT = "subject";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>subject</b>
+   * <p>
+   * Description: <b>What is account tied to?</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Account.subject</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Account:subject</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("Account:subject").toLocked();
 
+ /**
+   * Search parameter: <b>patient</b>
+   * <p>
+   * Description: <b>What is account tied to?</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Account.subject</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="patient", path="Account.subject", description="What is account tied to?", type="reference" )
   public static final String SP_PATIENT = "patient";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>patient</b>
+   * <p>
+   * Description: <b>What is account tied to?</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Account.subject</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Account:patient</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Account:patient").toLocked();
 
+ /**
+   * Search parameter: <b>name</b>
+   * <p>
+   * Description: <b>Human-readable label</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>Account.name</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="name", path="Account.name", description="Human-readable label", type="string" )
   public static final String SP_NAME = "name";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>name</b>
+   * <p>
+   * Description: <b>Human-readable label</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>Account.name</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.StringClientParam NAME = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_NAME);
+
+ /**
+   * Search parameter: <b>type</b>
+   * <p>
+   * Description: <b>E.g. patient, expense, depreciation</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Account.type</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="type", path="Account.type", description="E.g. patient, expense, depreciation", type="token" )
   public static final String SP_TYPE = "type";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>type</b>
+   * <p>
+   * Description: <b>E.g. patient, expense, depreciation</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Account.type</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE);
+
+ /**
+   * Search parameter: <b>status</b>
+   * <p>
+   * Description: <b>active | inactive</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Account.status</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="status", path="Account.status", description="active | inactive", type="token" )
   public static final String SP_STATUS = "status";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>status</b>
+   * <p>
+   * Description: <b>active | inactive</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Account.status</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS);
+
 
 }
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Address.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Age.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import ca.uhn.fhir.model.api.annotation.DatatypeDef;
 import ca.uhn.fhir.model.api.annotation.Block;

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/AllergyIntolerance.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -2132,54 +2132,324 @@ public class AllergyIntolerance extends DomainResource {
     return ResourceType.AllergyIntolerance;
    }
 
+ /**
+   * Search parameter: <b>severity</b>
+   * <p>
+   * Description: <b>mild | moderate | severe (of event as a whole)</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AllergyIntolerance.reaction.severity</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="severity", path="AllergyIntolerance.reaction.severity", description="mild | moderate | severe (of event as a whole)", type="token" )
   public static final String SP_SEVERITY = "severity";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>severity</b>
+   * <p>
+   * Description: <b>mild | moderate | severe (of event as a whole)</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AllergyIntolerance.reaction.severity</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam SEVERITY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SEVERITY);
+
+ /**
+   * Search parameter: <b>date</b>
+   * <p>
+   * Description: <b>When recorded</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>AllergyIntolerance.recordedDate</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="date", path="AllergyIntolerance.recordedDate", description="When recorded", type="date" )
   public static final String SP_DATE = "date";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>date</b>
+   * <p>
+   * Description: <b>When recorded</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>AllergyIntolerance.recordedDate</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE);
+
+ /**
+   * Search parameter: <b>identifier</b>
+   * <p>
+   * Description: <b>External ids for this item</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AllergyIntolerance.identifier</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="identifier", path="AllergyIntolerance.identifier", description="External ids for this item", type="token" )
   public static final String SP_IDENTIFIER = "identifier";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>identifier</b>
+   * <p>
+   * Description: <b>External ids for this item</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AllergyIntolerance.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
+
+ /**
+   * Search parameter: <b>manifestation</b>
+   * <p>
+   * Description: <b>Clinical symptoms/signs associated with the Event</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AllergyIntolerance.reaction.manifestation</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="manifestation", path="AllergyIntolerance.reaction.manifestation", description="Clinical symptoms/signs associated with the Event", type="token" )
   public static final String SP_MANIFESTATION = "manifestation";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>manifestation</b>
+   * <p>
+   * Description: <b>Clinical symptoms/signs associated with the Event</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AllergyIntolerance.reaction.manifestation</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam MANIFESTATION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_MANIFESTATION);
+
+ /**
+   * Search parameter: <b>recorder</b>
+   * <p>
+   * Description: <b>Who recorded the sensitivity</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>AllergyIntolerance.recorder</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="recorder", path="AllergyIntolerance.recorder", description="Who recorded the sensitivity", type="reference" )
   public static final String SP_RECORDER = "recorder";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>recorder</b>
+   * <p>
+   * Description: <b>Who recorded the sensitivity</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>AllergyIntolerance.recorder</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RECORDER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RECORDER);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>AllergyIntolerance:recorder</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_RECORDER = new ca.uhn.fhir.model.api.Include("AllergyIntolerance:recorder").toLocked();
 
+ /**
+   * Search parameter: <b>substance</b>
+   * <p>
+   * Description: <b>Substance, (or class) considered to be responsible for risk</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AllergyIntolerance.substance, AllergyIntolerance.reaction.substance</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="substance", path="AllergyIntolerance.substance|AllergyIntolerance.reaction.substance", description="Substance, (or class) considered to be responsible for risk", type="token" )
   public static final String SP_SUBSTANCE = "substance";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>substance</b>
+   * <p>
+   * Description: <b>Substance, (or class) considered to be responsible for risk</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AllergyIntolerance.substance, AllergyIntolerance.reaction.substance</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam SUBSTANCE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SUBSTANCE);
+
+ /**
+   * Search parameter: <b>criticality</b>
+   * <p>
+   * Description: <b>CRITL | CRITH | CRITU</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AllergyIntolerance.criticality</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="criticality", path="AllergyIntolerance.criticality", description="CRITL | CRITH | CRITU", type="token" )
   public static final String SP_CRITICALITY = "criticality";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>criticality</b>
+   * <p>
+   * Description: <b>CRITL | CRITH | CRITU</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AllergyIntolerance.criticality</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam CRITICALITY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CRITICALITY);
+
+ /**
+   * Search parameter: <b>reporter</b>
+   * <p>
+   * Description: <b>Source of the information about the allergy</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>AllergyIntolerance.reporter</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="reporter", path="AllergyIntolerance.reporter", description="Source of the information about the allergy", type="reference" )
   public static final String SP_REPORTER = "reporter";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>reporter</b>
+   * <p>
+   * Description: <b>Source of the information about the allergy</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>AllergyIntolerance.reporter</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REPORTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REPORTER);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>AllergyIntolerance:reporter</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_REPORTER = new ca.uhn.fhir.model.api.Include("AllergyIntolerance:reporter").toLocked();
 
+ /**
+   * Search parameter: <b>type</b>
+   * <p>
+   * Description: <b>allergy | intolerance - Underlying mechanism (if known)</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AllergyIntolerance.type</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="type", path="AllergyIntolerance.type", description="allergy | intolerance - Underlying mechanism (if known)", type="token" )
   public static final String SP_TYPE = "type";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>type</b>
+   * <p>
+   * Description: <b>allergy | intolerance - Underlying mechanism (if known)</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AllergyIntolerance.type</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE);
+
+ /**
+   * Search parameter: <b>onset</b>
+   * <p>
+   * Description: <b>Date(/time) when manifestations showed</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>AllergyIntolerance.reaction.onset</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="onset", path="AllergyIntolerance.reaction.onset", description="Date(/time) when manifestations showed", type="date" )
   public static final String SP_ONSET = "onset";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>onset</b>
+   * <p>
+   * Description: <b>Date(/time) when manifestations showed</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>AllergyIntolerance.reaction.onset</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam ONSET = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_ONSET);
+
+ /**
+   * Search parameter: <b>route</b>
+   * <p>
+   * Description: <b>How the subject was exposed to the substance</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AllergyIntolerance.reaction.exposureRoute</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="route", path="AllergyIntolerance.reaction.exposureRoute", description="How the subject was exposed to the substance", type="token" )
   public static final String SP_ROUTE = "route";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>route</b>
+   * <p>
+   * Description: <b>How the subject was exposed to the substance</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AllergyIntolerance.reaction.exposureRoute</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam ROUTE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ROUTE);
+
+ /**
+   * Search parameter: <b>patient</b>
+   * <p>
+   * Description: <b>Who the sensitivity is for</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>AllergyIntolerance.patient</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="patient", path="AllergyIntolerance.patient", description="Who the sensitivity is for", type="reference" )
   public static final String SP_PATIENT = "patient";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>patient</b>
+   * <p>
+   * Description: <b>Who the sensitivity is for</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>AllergyIntolerance.patient</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>AllergyIntolerance:patient</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("AllergyIntolerance:patient").toLocked();
 
+ /**
+   * Search parameter: <b>category</b>
+   * <p>
+   * Description: <b>food | medication | environment | other - Category of Substance</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AllergyIntolerance.category</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="category", path="AllergyIntolerance.category", description="food | medication | environment | other - Category of Substance", type="token" )
   public static final String SP_CATEGORY = "category";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>category</b>
+   * <p>
+   * Description: <b>food | medication | environment | other - Category of Substance</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AllergyIntolerance.category</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam CATEGORY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CATEGORY);
+
+ /**
+   * Search parameter: <b>last-date</b>
+   * <p>
+   * Description: <b>Date(/time) of last known occurrence of a reaction</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>AllergyIntolerance.lastOccurence</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="last-date", path="AllergyIntolerance.lastOccurence", description="Date(/time) of last known occurrence of a reaction", type="date" )
   public static final String SP_LAST_DATE = "last-date";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>last-date</b>
+   * <p>
+   * Description: <b>Date(/time) of last known occurrence of a reaction</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>AllergyIntolerance.lastOccurence</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam LAST_DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_LAST_DATE);
+
+ /**
+   * Search parameter: <b>status</b>
+   * <p>
+   * Description: <b>active | unconfirmed | confirmed | inactive | resolved | refuted | entered-in-error</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AllergyIntolerance.status</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="status", path="AllergyIntolerance.status", description="active | unconfirmed | confirmed | inactive | resolved | refuted | entered-in-error", type="token" )
   public static final String SP_STATUS = "status";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>status</b>
+   * <p>
+   * Description: <b>active | unconfirmed | confirmed | inactive | resolved | refuted | entered-in-error</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AllergyIntolerance.status</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS);
+
 
 }
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Annotation.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Appointment.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -1544,46 +1544,190 @@ public class Appointment extends DomainResource {
     return ResourceType.Appointment;
    }
 
+ /**
+   * Search parameter: <b>date</b>
+   * <p>
+   * Description: <b>Appointment date/time.</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>Appointment.start</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="date", path="Appointment.start", description="Appointment date/time.", type="date" )
   public static final String SP_DATE = "date";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>date</b>
+   * <p>
+   * Description: <b>Appointment date/time.</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>Appointment.start</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE);
+
+ /**
+   * Search parameter: <b>actor</b>
+   * <p>
+   * Description: <b>Any one of the individuals participating in the appointment</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Appointment.participant.actor</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="actor", path="Appointment.participant.actor", description="Any one of the individuals participating in the appointment", type="reference" )
   public static final String SP_ACTOR = "actor";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>actor</b>
+   * <p>
+   * Description: <b>Any one of the individuals participating in the appointment</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Appointment.participant.actor</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ACTOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ACTOR);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Appointment:actor</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_ACTOR = new ca.uhn.fhir.model.api.Include("Appointment:actor").toLocked();
 
+ /**
+   * Search parameter: <b>identifier</b>
+   * <p>
+   * Description: <b>An Identifier of the Appointment</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Appointment.identifier</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="identifier", path="Appointment.identifier", description="An Identifier of the Appointment", type="token" )
   public static final String SP_IDENTIFIER = "identifier";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>identifier</b>
+   * <p>
+   * Description: <b>An Identifier of the Appointment</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Appointment.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
+
+ /**
+   * Search parameter: <b>practitioner</b>
+   * <p>
+   * Description: <b>One of the individuals of the appointment is this practitioner</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Appointment.participant.actor</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="practitioner", path="Appointment.participant.actor", description="One of the individuals of the appointment is this practitioner", type="reference" )
   public static final String SP_PRACTITIONER = "practitioner";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>practitioner</b>
+   * <p>
+   * Description: <b>One of the individuals of the appointment is this practitioner</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Appointment.participant.actor</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PRACTITIONER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PRACTITIONER);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Appointment:practitioner</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PRACTITIONER = new ca.uhn.fhir.model.api.Include("Appointment:practitioner").toLocked();
 
+ /**
+   * Search parameter: <b>part-status</b>
+   * <p>
+   * Description: <b>The Participation status of the subject, or other participant on the appointment. Can be used to locate participants that have not responded to meeting requests.</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Appointment.participant.status</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="part-status", path="Appointment.participant.status", description="The Participation status of the subject, or other participant on the appointment. Can be used to locate participants that have not responded to meeting requests.", type="token" )
   public static final String SP_PART_STATUS = "part-status";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>part-status</b>
+   * <p>
+   * Description: <b>The Participation status of the subject, or other participant on the appointment. Can be used to locate participants that have not responded to meeting requests.</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Appointment.participant.status</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam PART_STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_PART_STATUS);
+
+ /**
+   * Search parameter: <b>patient</b>
+   * <p>
+   * Description: <b>One of the individuals of the appointment is this patient</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Appointment.participant.actor</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="patient", path="Appointment.participant.actor", description="One of the individuals of the appointment is this patient", type="reference" )
   public static final String SP_PATIENT = "patient";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>patient</b>
+   * <p>
+   * Description: <b>One of the individuals of the appointment is this patient</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Appointment.participant.actor</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Appointment:patient</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Appointment:patient").toLocked();
 
+ /**
+   * Search parameter: <b>location</b>
+   * <p>
+   * Description: <b>This location is listed in the participants of the appointment</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Appointment.participant.actor</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="location", path="Appointment.participant.actor", description="This location is listed in the participants of the appointment", type="reference" )
   public static final String SP_LOCATION = "location";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>location</b>
+   * <p>
+   * Description: <b>This location is listed in the participants of the appointment</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Appointment.participant.actor</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam LOCATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_LOCATION);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Appointment:location</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_LOCATION = new ca.uhn.fhir.model.api.Include("Appointment:location").toLocked();
 
+ /**
+   * Search parameter: <b>status</b>
+   * <p>
+   * Description: <b>The overall status of the appointment</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Appointment.status</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="status", path="Appointment.status", description="The overall status of the appointment", type="token" )
   public static final String SP_STATUS = "status";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>status</b>
+   * <p>
+   * Description: <b>The overall status of the appointment</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Appointment.status</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS);
+
 
 }
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/AppointmentResponse.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -770,44 +770,170 @@ public class AppointmentResponse extends DomainResource {
     return ResourceType.AppointmentResponse;
    }
 
+ /**
+   * Search parameter: <b>actor</b>
+   * <p>
+   * Description: <b>The Person, Location/HealthcareService or Device that this appointment response replies for</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>AppointmentResponse.actor</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="actor", path="AppointmentResponse.actor", description="The Person, Location/HealthcareService or Device that this appointment response replies for", type="reference" )
   public static final String SP_ACTOR = "actor";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>actor</b>
+   * <p>
+   * Description: <b>The Person, Location/HealthcareService or Device that this appointment response replies for</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>AppointmentResponse.actor</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ACTOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ACTOR);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>AppointmentResponse:actor</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_ACTOR = new ca.uhn.fhir.model.api.Include("AppointmentResponse:actor").toLocked();
 
+ /**
+   * Search parameter: <b>identifier</b>
+   * <p>
+   * Description: <b>An Identifier in this appointment response</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AppointmentResponse.identifier</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="identifier", path="AppointmentResponse.identifier", description="An Identifier in this appointment response", type="token" )
   public static final String SP_IDENTIFIER = "identifier";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>identifier</b>
+   * <p>
+   * Description: <b>An Identifier in this appointment response</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AppointmentResponse.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
+
+ /**
+   * Search parameter: <b>practitioner</b>
+   * <p>
+   * Description: <b>This Response is for this Practitioner</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>AppointmentResponse.actor</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="practitioner", path="AppointmentResponse.actor", description="This Response is for this Practitioner", type="reference" )
   public static final String SP_PRACTITIONER = "practitioner";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>practitioner</b>
+   * <p>
+   * Description: <b>This Response is for this Practitioner</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>AppointmentResponse.actor</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PRACTITIONER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PRACTITIONER);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>AppointmentResponse:practitioner</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PRACTITIONER = new ca.uhn.fhir.model.api.Include("AppointmentResponse:practitioner").toLocked();
 
+ /**
+   * Search parameter: <b>part-status</b>
+   * <p>
+   * Description: <b>The participants acceptance status for this appointment</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AppointmentResponse.participantStatus</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="part-status", path="AppointmentResponse.participantStatus", description="The participants acceptance status for this appointment", type="token" )
   public static final String SP_PART_STATUS = "part-status";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>part-status</b>
+   * <p>
+   * Description: <b>The participants acceptance status for this appointment</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AppointmentResponse.participantStatus</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam PART_STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_PART_STATUS);
+
+ /**
+   * Search parameter: <b>patient</b>
+   * <p>
+   * Description: <b>This Response is for this Patient</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>AppointmentResponse.actor</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="patient", path="AppointmentResponse.actor", description="This Response is for this Patient", type="reference" )
   public static final String SP_PATIENT = "patient";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>patient</b>
+   * <p>
+   * Description: <b>This Response is for this Patient</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>AppointmentResponse.actor</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>AppointmentResponse:patient</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("AppointmentResponse:patient").toLocked();
 
+ /**
+   * Search parameter: <b>appointment</b>
+   * <p>
+   * Description: <b>The appointment that the response is attached to</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>AppointmentResponse.appointment</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="appointment", path="AppointmentResponse.appointment", description="The appointment that the response is attached to", type="reference" )
   public static final String SP_APPOINTMENT = "appointment";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>appointment</b>
+   * <p>
+   * Description: <b>The appointment that the response is attached to</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>AppointmentResponse.appointment</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam APPOINTMENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_APPOINTMENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>AppointmentResponse:appointment</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_APPOINTMENT = new ca.uhn.fhir.model.api.Include("AppointmentResponse:appointment").toLocked();
 
+ /**
+   * Search parameter: <b>location</b>
+   * <p>
+   * Description: <b>This Response is for this Location</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>AppointmentResponse.actor</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="location", path="AppointmentResponse.actor", description="This Response is for this Location", type="reference" )
   public static final String SP_LOCATION = "location";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>location</b>
+   * <p>
+   * Description: <b>This Response is for this Location</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>AppointmentResponse.actor</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam LOCATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_LOCATION);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>AppointmentResponse:location</b>".

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Attachment.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/AuditEvent.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -2984,58 +2984,364 @@ public class AuditEvent extends DomainResource {
     return ResourceType.AuditEvent;
    }
 
+ /**
+   * Search parameter: <b>date</b>
+   * <p>
+   * Description: <b>Time when the event occurred on source</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>AuditEvent.recorded</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="date", path="AuditEvent.recorded", description="Time when the event occurred on source", type="date" )
   public static final String SP_DATE = "date";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>date</b>
+   * <p>
+   * Description: <b>Time when the event occurred on source</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>AuditEvent.recorded</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE);
+
+ /**
+   * Search parameter: <b>address</b>
+   * <p>
+   * Description: <b>Identifier for the network access point of the user device</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AuditEvent.agent.network.address</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="address", path="AuditEvent.agent.network.address", description="Identifier for the network access point of the user device", type="token" )
   public static final String SP_ADDRESS = "address";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>address</b>
+   * <p>
+   * Description: <b>Identifier for the network access point of the user device</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AuditEvent.agent.network.address</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam ADDRESS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ADDRESS);
+
+ /**
+   * Search parameter: <b>source</b>
+   * <p>
+   * Description: <b>The identity of source detecting the event</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AuditEvent.source.identifier</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="source", path="AuditEvent.source.identifier", description="The identity of source detecting the event", type="token" )
   public static final String SP_SOURCE = "source";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>source</b>
+   * <p>
+   * Description: <b>The identity of source detecting the event</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AuditEvent.source.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam SOURCE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SOURCE);
+
+ /**
+   * Search parameter: <b>type</b>
+   * <p>
+   * Description: <b>Type/identifier of event</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AuditEvent.type</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="type", path="AuditEvent.type", description="Type/identifier of event", type="token" )
   public static final String SP_TYPE = "type";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>type</b>
+   * <p>
+   * Description: <b>Type/identifier of event</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AuditEvent.type</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE);
+
+ /**
+   * Search parameter: <b>altid</b>
+   * <p>
+   * Description: <b>Alternative User id e.g. authentication</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AuditEvent.agent.altId</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="altid", path="AuditEvent.agent.altId", description="Alternative User id e.g. authentication", type="token" )
   public static final String SP_ALTID = "altid";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>altid</b>
+   * <p>
+   * Description: <b>Alternative User id e.g. authentication</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AuditEvent.agent.altId</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam ALTID = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ALTID);
+
+ /**
+   * Search parameter: <b>participant</b>
+   * <p>
+   * Description: <b>Direct reference to resource</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>AuditEvent.agent.reference</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="participant", path="AuditEvent.agent.reference", description="Direct reference to resource", type="reference" )
   public static final String SP_PARTICIPANT = "participant";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>participant</b>
+   * <p>
+   * Description: <b>Direct reference to resource</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>AuditEvent.agent.reference</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PARTICIPANT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PARTICIPANT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>AuditEvent:participant</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PARTICIPANT = new ca.uhn.fhir.model.api.Include("AuditEvent:participant").toLocked();
 
+ /**
+   * Search parameter: <b>reference</b>
+   * <p>
+   * Description: <b>Specific instance of resource (e.g. versioned)</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>AuditEvent.entity.reference</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="reference", path="AuditEvent.entity.reference", description="Specific instance of resource (e.g. versioned)", type="reference" )
   public static final String SP_REFERENCE = "reference";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>reference</b>
+   * <p>
+   * Description: <b>Specific instance of resource (e.g. versioned)</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>AuditEvent.entity.reference</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REFERENCE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REFERENCE);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>AuditEvent:reference</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_REFERENCE = new ca.uhn.fhir.model.api.Include("AuditEvent:reference").toLocked();
 
+ /**
+   * Search parameter: <b>site</b>
+   * <p>
+   * Description: <b>Logical source location within the enterprise</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AuditEvent.source.site</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="site", path="AuditEvent.source.site", description="Logical source location within the enterprise", type="token" )
   public static final String SP_SITE = "site";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>site</b>
+   * <p>
+   * Description: <b>Logical source location within the enterprise</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AuditEvent.source.site</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam SITE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SITE);
+
+ /**
+   * Search parameter: <b>subtype</b>
+   * <p>
+   * Description: <b>More specific type/id for the event</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AuditEvent.subtype</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="subtype", path="AuditEvent.subtype", description="More specific type/id for the event", type="token" )
   public static final String SP_SUBTYPE = "subtype";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>subtype</b>
+   * <p>
+   * Description: <b>More specific type/id for the event</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AuditEvent.subtype</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam SUBTYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SUBTYPE);
+
+ /**
+   * Search parameter: <b>identity</b>
+   * <p>
+   * Description: <b>Specific instance of object (e.g. versioned)</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AuditEvent.entity.identifier</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="identity", path="AuditEvent.entity.identifier", description="Specific instance of object (e.g. versioned)", type="token" )
   public static final String SP_IDENTITY = "identity";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>identity</b>
+   * <p>
+   * Description: <b>Specific instance of object (e.g. versioned)</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AuditEvent.entity.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTITY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTITY);
+
+ /**
+   * Search parameter: <b>patient</b>
+   * <p>
+   * Description: <b>Direct reference to resource</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>AuditEvent.agent.reference, AuditEvent.entity.reference</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="patient", path="AuditEvent.agent.reference|AuditEvent.entity.reference", description="Direct reference to resource", type="reference" )
   public static final String SP_PATIENT = "patient";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>patient</b>
+   * <p>
+   * Description: <b>Direct reference to resource</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>AuditEvent.agent.reference, AuditEvent.entity.reference</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>AuditEvent:patient</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("AuditEvent:patient").toLocked();
 
+ /**
+   * Search parameter: <b>object-type</b>
+   * <p>
+   * Description: <b>Type of object involved</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AuditEvent.entity.type</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="object-type", path="AuditEvent.entity.type", description="Type of object involved", type="token" )
   public static final String SP_OBJECT_TYPE = "object-type";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>object-type</b>
+   * <p>
+   * Description: <b>Type of object involved</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AuditEvent.entity.type</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam OBJECT_TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_OBJECT_TYPE);
+
+ /**
+   * Search parameter: <b>name</b>
+   * <p>
+   * Description: <b>Human-meaningful name for the user</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>AuditEvent.agent.name</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="name", path="AuditEvent.agent.name", description="Human-meaningful name for the user", type="string" )
   public static final String SP_NAME = "name";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>name</b>
+   * <p>
+   * Description: <b>Human-meaningful name for the user</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>AuditEvent.agent.name</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.StringClientParam NAME = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_NAME);
+
+ /**
+   * Search parameter: <b>action</b>
+   * <p>
+   * Description: <b>Type of action performed during the event</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AuditEvent.action</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="action", path="AuditEvent.action", description="Type of action performed during the event", type="token" )
   public static final String SP_ACTION = "action";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>action</b>
+   * <p>
+   * Description: <b>Type of action performed during the event</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AuditEvent.action</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam ACTION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ACTION);
+
+ /**
+   * Search parameter: <b>user</b>
+   * <p>
+   * Description: <b>Unique identifier for the user</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AuditEvent.agent.userId</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="user", path="AuditEvent.agent.userId", description="Unique identifier for the user", type="token" )
   public static final String SP_USER = "user";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>user</b>
+   * <p>
+   * Description: <b>Unique identifier for the user</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>AuditEvent.agent.userId</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam USER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_USER);
+
+ /**
+   * Search parameter: <b>desc</b>
+   * <p>
+   * Description: <b>Descriptor for entity</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>AuditEvent.entity.name</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="desc", path="AuditEvent.entity.name", description="Descriptor for entity", type="string" )
   public static final String SP_DESC = "desc";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>desc</b>
+   * <p>
+   * Description: <b>Descriptor for entity</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>AuditEvent.entity.name</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.StringClientParam DESC = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_DESC);
+
+ /**
+   * Search parameter: <b>policy</b>
+   * <p>
+   * Description: <b>Policy that authorized event</b><br>
+   * Type: <b>uri</b><br>
+   * Path: <b>AuditEvent.agent.policy</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="policy", path="AuditEvent.agent.policy", description="Policy that authorized event", type="uri" )
   public static final String SP_POLICY = "policy";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>policy</b>
+   * <p>
+   * Description: <b>Policy that authorized event</b><br>
+   * Type: <b>uri</b><br>
+   * Path: <b>AuditEvent.agent.policy</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.UriClientParam POLICY = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_POLICY);
+
 
 }
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BackboneElement.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Basic.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -404,30 +404,138 @@ public class Basic extends DomainResource {
     return ResourceType.Basic;
    }
 
+ /**
+   * Search parameter: <b>identifier</b>
+   * <p>
+   * Description: <b>Business identifier</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Basic.identifier</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="identifier", path="Basic.identifier", description="Business identifier", type="token" )
   public static final String SP_IDENTIFIER = "identifier";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>identifier</b>
+   * <p>
+   * Description: <b>Business identifier</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Basic.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
+
+ /**
+   * Search parameter: <b>code</b>
+   * <p>
+   * Description: <b>Kind of Resource</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Basic.code</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="code", path="Basic.code", description="Kind of Resource", type="token" )
   public static final String SP_CODE = "code";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>code</b>
+   * <p>
+   * Description: <b>Kind of Resource</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Basic.code</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CODE);
+
+ /**
+   * Search parameter: <b>subject</b>
+   * <p>
+   * Description: <b>Identifies the focus of this resource</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Basic.subject</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="subject", path="Basic.subject", description="Identifies the focus of this resource", type="reference" )
   public static final String SP_SUBJECT = "subject";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>subject</b>
+   * <p>
+   * Description: <b>Identifies the focus of this resource</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Basic.subject</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Basic:subject</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("Basic:subject").toLocked();
 
+ /**
+   * Search parameter: <b>created</b>
+   * <p>
+   * Description: <b>When created</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>Basic.created</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="created", path="Basic.created", description="When created", type="date" )
   public static final String SP_CREATED = "created";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>created</b>
+   * <p>
+   * Description: <b>When created</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>Basic.created</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam CREATED = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_CREATED);
+
+ /**
+   * Search parameter: <b>patient</b>
+   * <p>
+   * Description: <b>Identifies the focus of this resource</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Basic.subject</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="patient", path="Basic.subject", description="Identifies the focus of this resource", type="reference" )
   public static final String SP_PATIENT = "patient";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>patient</b>
+   * <p>
+   * Description: <b>Identifies the focus of this resource</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Basic.subject</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Basic:patient</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Basic:patient").toLocked();
 
+ /**
+   * Search parameter: <b>author</b>
+   * <p>
+   * Description: <b>Who created</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Basic.author</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="author", path="Basic.author", description="Who created", type="reference" )
   public static final String SP_AUTHOR = "author";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>author</b>
+   * <p>
+   * Description: <b>Who created</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Basic.author</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam AUTHOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_AUTHOR);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Basic:author</b>".

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Binary.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -245,8 +245,26 @@ public class Binary extends BaseBinary implements IBaseBinary {
     return ResourceType.Binary;
    }
 
+ /**
+   * Search parameter: <b>contenttype</b>
+   * <p>
+   * Description: <b>MimeType of the binary content</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Binary.contentType</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="contenttype", path="Binary.contentType", description="MimeType of the binary content", type="token" )
   public static final String SP_CONTENTTYPE = "contenttype";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>contenttype</b>
+   * <p>
+   * Description: <b>MimeType of the binary content</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Binary.contentType</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONTENTTYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONTENTTYPE);
+
 
 }
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/BodySite.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -468,12 +468,66 @@ public class BodySite extends DomainResource {
     return ResourceType.BodySite;
    }
 
+ /**
+   * Search parameter: <b>identifier</b>
+   * <p>
+   * Description: <b>Identifier for this instance of the anatomical location</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>BodySite.identifier</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="identifier", path="BodySite.identifier", description="Identifier for this instance of the anatomical location", type="token" )
   public static final String SP_IDENTIFIER = "identifier";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>identifier</b>
+   * <p>
+   * Description: <b>Identifier for this instance of the anatomical location</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>BodySite.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
+
+ /**
+   * Search parameter: <b>code</b>
+   * <p>
+   * Description: <b>Named anatomical location</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>BodySite.code</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="code", path="BodySite.code", description="Named anatomical location", type="token" )
   public static final String SP_CODE = "code";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>code</b>
+   * <p>
+   * Description: <b>Named anatomical location</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>BodySite.code</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CODE);
+
+ /**
+   * Search parameter: <b>patient</b>
+   * <p>
+   * Description: <b>Patient to whom bodysite belongs</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>BodySite.patient</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="patient", path="BodySite.patient", description="Patient to whom bodysite belongs", type="reference" )
   public static final String SP_PATIENT = "patient";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>patient</b>
+   * <p>
+   * Description: <b>Patient to whom bodysite belongs</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>BodySite.patient</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>BodySite:patient</b>".

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Bundle.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -2429,18 +2429,72 @@ public class Bundle extends Resource implements IBaseBundle {
     return ResourceType.Bundle;
    }
 
+ /**
+   * Search parameter: <b>composition</b>
+   * <p>
+   * Description: <b>The first resource in the bundle, if the bundle type is "document" - this is a composition, and this parameter provides access to searches its contents</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Bundle.entry.resource(0)</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="composition", path="Bundle.entry.resource.item(0)", description="The first resource in the bundle, if the bundle type is \"document\" - this is a composition, and this parameter provides access to searches its contents", type="reference" )
   public static final String SP_COMPOSITION = "composition";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>composition</b>
+   * <p>
+   * Description: <b>The first resource in the bundle, if the bundle type is "document" - this is a composition, and this parameter provides access to searches its contents</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Bundle.entry.resource(0)</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam COMPOSITION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_COMPOSITION);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Bundle:composition</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_COMPOSITION = new ca.uhn.fhir.model.api.Include("Bundle:composition").toLocked();
 
+ /**
+   * Search parameter: <b>type</b>
+   * <p>
+   * Description: <b>document | message | transaction | transaction-response | batch | batch-response | history | searchset | collection</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Bundle.type</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="type", path="Bundle.type", description="document | message | transaction | transaction-response | batch | batch-response | history | searchset | collection", type="token" )
   public static final String SP_TYPE = "type";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>type</b>
+   * <p>
+   * Description: <b>document | message | transaction | transaction-response | batch | batch-response | history | searchset | collection</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Bundle.type</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE);
+
+ /**
+   * Search parameter: <b>message</b>
+   * <p>
+   * Description: <b>The first resource in the bundle, if the bundle type is "message" - this is a message header, and this parameter provides access to search its contents</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Bundle.entry.resource(0)</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="message", path="Bundle.entry.resource.item(0)", description="The first resource in the bundle, if the bundle type is \"message\" - this is a message header, and this parameter provides access to search its contents", type="reference" )
   public static final String SP_MESSAGE = "message";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>message</b>
+   * <p>
+   * Description: <b>The first resource in the bundle, if the bundle type is "message" - this is a message header, and this parameter provides access to search its contents</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Bundle.entry.resource(0)</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam MESSAGE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_MESSAGE);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Bundle:message</b>".

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CarePlan.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -3137,74 +3137,308 @@ public class CarePlan extends DomainResource {
     return ResourceType.CarePlan;
    }
 
+ /**
+   * Search parameter: <b>date</b>
+   * <p>
+   * Description: <b>Time period plan covers</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>CarePlan.period</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="date", path="CarePlan.period", description="Time period plan covers", type="date" )
   public static final String SP_DATE = "date";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>date</b>
+   * <p>
+   * Description: <b>Time period plan covers</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>CarePlan.period</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE);
+
+ /**
+   * Search parameter: <b>activitycode</b>
+   * <p>
+   * Description: <b>Detail type of activity</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>CarePlan.activity.detail.code</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="activitycode", path="CarePlan.activity.detail.code", description="Detail type of activity", type="token" )
   public static final String SP_ACTIVITYCODE = "activitycode";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>activitycode</b>
+   * <p>
+   * Description: <b>Detail type of activity</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>CarePlan.activity.detail.code</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam ACTIVITYCODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ACTIVITYCODE);
+
+ /**
+   * Search parameter: <b>activitydate</b>
+   * <p>
+   * Description: <b>Specified date occurs within period specified by CarePlan.activity.timingSchedule</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>CarePlan.activity.detail.scheduled[x]</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="activitydate", path="CarePlan.activity.detail.scheduled[x]", description="Specified date occurs within period specified by CarePlan.activity.timingSchedule", type="date" )
   public static final String SP_ACTIVITYDATE = "activitydate";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>activitydate</b>
+   * <p>
+   * Description: <b>Specified date occurs within period specified by CarePlan.activity.timingSchedule</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>CarePlan.activity.detail.scheduled[x]</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam ACTIVITYDATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_ACTIVITYDATE);
+
+ /**
+   * Search parameter: <b>activityreference</b>
+   * <p>
+   * Description: <b>Activity details defined in specific resource</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>CarePlan.activity.reference</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="activityreference", path="CarePlan.activity.reference", description="Activity details defined in specific resource", type="reference" )
   public static final String SP_ACTIVITYREFERENCE = "activityreference";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>activityreference</b>
+   * <p>
+   * Description: <b>Activity details defined in specific resource</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>CarePlan.activity.reference</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ACTIVITYREFERENCE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ACTIVITYREFERENCE);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>CarePlan:activityreference</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_ACTIVITYREFERENCE = new ca.uhn.fhir.model.api.Include("CarePlan:activityreference").toLocked();
 
+ /**
+   * Search parameter: <b>performer</b>
+   * <p>
+   * Description: <b>Matches if the practitioner is listed as a performer in any of the "simple" activities.  (For performers of the detailed activities, chain through the activitydetail search parameter.)</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>CarePlan.activity.detail.performer</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="performer", path="CarePlan.activity.detail.performer", description="Matches if the practitioner is listed as a performer in any of the \"simple\" activities.  (For performers of the detailed activities, chain through the activitydetail search parameter.)", type="reference" )
   public static final String SP_PERFORMER = "performer";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>performer</b>
+   * <p>
+   * Description: <b>Matches if the practitioner is listed as a performer in any of the "simple" activities.  (For performers of the detailed activities, chain through the activitydetail search parameter.)</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>CarePlan.activity.detail.performer</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PERFORMER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PERFORMER);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>CarePlan:performer</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PERFORMER = new ca.uhn.fhir.model.api.Include("CarePlan:performer").toLocked();
 
+ /**
+   * Search parameter: <b>goal</b>
+   * <p>
+   * Description: <b>Desired outcome of plan</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>CarePlan.goal</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="goal", path="CarePlan.goal", description="Desired outcome of plan", type="reference" )
   public static final String SP_GOAL = "goal";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>goal</b>
+   * <p>
+   * Description: <b>Desired outcome of plan</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>CarePlan.goal</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam GOAL = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_GOAL);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>CarePlan:goal</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_GOAL = new ca.uhn.fhir.model.api.Include("CarePlan:goal").toLocked();
 
+ /**
+   * Search parameter: <b>subject</b>
+   * <p>
+   * Description: <b>Who care plan is for</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>CarePlan.subject</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="subject", path="CarePlan.subject", description="Who care plan is for", type="reference" )
   public static final String SP_SUBJECT = "subject";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>subject</b>
+   * <p>
+   * Description: <b>Who care plan is for</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>CarePlan.subject</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>CarePlan:subject</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("CarePlan:subject").toLocked();
 
+ /**
+   * Search parameter: <b>relatedcode</b>
+   * <p>
+   * Description: <b>includes | replaces | fulfills</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>CarePlan.relatedPlan.code</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="relatedcode", path="CarePlan.relatedPlan.code", description="includes | replaces | fulfills", type="token" )
   public static final String SP_RELATEDCODE = "relatedcode";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>relatedcode</b>
+   * <p>
+   * Description: <b>includes | replaces | fulfills</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>CarePlan.relatedPlan.code</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam RELATEDCODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_RELATEDCODE);
+
+ /**
+   * Search parameter: <b>participant</b>
+   * <p>
+   * Description: <b>Who is involved</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>CarePlan.participant.member</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="participant", path="CarePlan.participant.member", description="Who is involved", type="reference" )
   public static final String SP_PARTICIPANT = "participant";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>participant</b>
+   * <p>
+   * Description: <b>Who is involved</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>CarePlan.participant.member</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PARTICIPANT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PARTICIPANT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>CarePlan:participant</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PARTICIPANT = new ca.uhn.fhir.model.api.Include("CarePlan:participant").toLocked();
 
+ /**
+   * Search parameter: <b>relatedplan</b>
+   * <p>
+   * Description: <b>Plan relationship exists with</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>CarePlan.relatedPlan.plan</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="relatedplan", path="CarePlan.relatedPlan.plan", description="Plan relationship exists with", type="reference" )
   public static final String SP_RELATEDPLAN = "relatedplan";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>relatedplan</b>
+   * <p>
+   * Description: <b>Plan relationship exists with</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>CarePlan.relatedPlan.plan</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RELATEDPLAN = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RELATEDPLAN);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>CarePlan:relatedplan</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_RELATEDPLAN = new ca.uhn.fhir.model.api.Include("CarePlan:relatedplan").toLocked();
 
+ /**
+   * Search parameter: <b>condition</b>
+   * <p>
+   * Description: <b>Health issues this plan addresses</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>CarePlan.addresses</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="condition", path="CarePlan.addresses", description="Health issues this plan addresses", type="reference" )
   public static final String SP_CONDITION = "condition";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>condition</b>
+   * <p>
+   * Description: <b>Health issues this plan addresses</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>CarePlan.addresses</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam CONDITION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_CONDITION);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>CarePlan:condition</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_CONDITION = new ca.uhn.fhir.model.api.Include("CarePlan:condition").toLocked();
 
+ /**
+   * Search parameter: <b>related</b>
+   * <p>
+   * Description: <b>A combination of the type of relationship and the related plan</b><br>
+   * Type: <b>composite</b><br>
+   * Path: <b></b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="related", path="", description="A combination of the type of relationship and the related plan", type="composite" )
   public static final String SP_RELATED = "related";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>related</b>
+   * <p>
+   * Description: <b>A combination of the type of relationship and the related plan</b><br>
+   * Type: <b>composite</b><br>
+   * Path: <b></b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.CompositeClientParam RELATED = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_RELATED);
+
+ /**
+   * Search parameter: <b>patient</b>
+   * <p>
+   * Description: <b>Who care plan is for</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>CarePlan.subject</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="patient", path="CarePlan.subject", description="Who care plan is for", type="reference" )
   public static final String SP_PATIENT = "patient";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>patient</b>
+   * <p>
+   * Description: <b>Who care plan is for</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>CarePlan.subject</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>CarePlan:patient</b>".

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Claim.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -6052,48 +6052,210 @@ public class Claim extends DomainResource {
     return ResourceType.Claim;
    }
 
+ /**
+   * Search parameter: <b>identifier</b>
+   * <p>
+   * Description: <b>The primary identifier of the financial resource</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Claim.identifier</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="identifier", path="Claim.identifier", description="The primary identifier of the financial resource", type="token" )
   public static final String SP_IDENTIFIER = "identifier";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>identifier</b>
+   * <p>
+   * Description: <b>The primary identifier of the financial resource</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Claim.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
+
+ /**
+   * Search parameter: <b>provider</b>
+   * <p>
+   * Description: <b>Provider responsible for the Claim</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Claim.provider</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="provider", path="Claim.provider", description="Provider responsible for the Claim", type="reference" )
   public static final String SP_PROVIDER = "provider";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>provider</b>
+   * <p>
+   * Description: <b>Provider responsible for the Claim</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Claim.provider</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PROVIDER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PROVIDER);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Claim:provider</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PROVIDER = new ca.uhn.fhir.model.api.Include("Claim:provider").toLocked();
 
+ /**
+   * Search parameter: <b>use</b>
+   * <p>
+   * Description: <b>The kind of financial resource</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Claim.use</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="use", path="Claim.use", description="The kind of financial resource", type="token" )
   public static final String SP_USE = "use";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>use</b>
+   * <p>
+   * Description: <b>The kind of financial resource</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Claim.use</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam USE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_USE);
+
+ /**
+   * Search parameter: <b>patient</b>
+   * <p>
+   * Description: <b>Patient receiveing the services</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Claim.patient</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="patient", path="Claim.patient", description="Patient receiveing the services", type="reference" )
   public static final String SP_PATIENT = "patient";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>patient</b>
+   * <p>
+   * Description: <b>Patient receiveing the services</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Claim.patient</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Claim:patient</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Claim:patient").toLocked();
 
+ /**
+   * Search parameter: <b>created</b>
+   * <p>
+   * Description: <b>The creation date for the Claim</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>Claim.created</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="created", path="Claim.created", description="The creation date for the Claim", type="date" )
   public static final String SP_CREATED = "created";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>created</b>
+   * <p>
+   * Description: <b>The creation date for the Claim</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>Claim.created</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam CREATED = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_CREATED);
+
+ /**
+   * Search parameter: <b>organization</b>
+   * <p>
+   * Description: <b>The reference to the providing organization</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Claim.organization</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="organization", path="Claim.organization", description="The reference to the providing organization", type="reference" )
   public static final String SP_ORGANIZATION = "organization";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>organization</b>
+   * <p>
+   * Description: <b>The reference to the providing organization</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Claim.organization</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ORGANIZATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ORGANIZATION);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Claim:organization</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_ORGANIZATION = new ca.uhn.fhir.model.api.Include("Claim:organization").toLocked();
 
+ /**
+   * Search parameter: <b>priority</b>
+   * <p>
+   * Description: <b>Processing priority requested</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Claim.priority</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="priority", path="Claim.priority", description="Processing priority requested", type="token" )
   public static final String SP_PRIORITY = "priority";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>priority</b>
+   * <p>
+   * Description: <b>Processing priority requested</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Claim.priority</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam PRIORITY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_PRIORITY);
+
+ /**
+   * Search parameter: <b>facility</b>
+   * <p>
+   * Description: <b>Facility responsible for the goods and services</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Claim.facility</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="facility", path="Claim.facility", description="Facility responsible for the goods and services", type="reference" )
   public static final String SP_FACILITY = "facility";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>facility</b>
+   * <p>
+   * Description: <b>Facility responsible for the goods and services</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Claim.facility</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam FACILITY = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_FACILITY);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Claim:facility</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_FACILITY = new ca.uhn.fhir.model.api.Include("Claim:facility").toLocked();
 
+ /**
+   * Search parameter: <b>target</b>
+   * <p>
+   * Description: <b>The target payor/insurer for the Claim</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Claim.target</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="target", path="Claim.target", description="The target payor/insurer for the Claim", type="reference" )
   public static final String SP_TARGET = "target";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>target</b>
+   * <p>
+   * Description: <b>The target payor/insurer for the Claim</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Claim.target</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam TARGET = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_TARGET);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Claim:target</b>".

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ClaimResponse.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -5080,32 +5080,158 @@ public class ClaimResponse extends DomainResource {
     return ResourceType.ClaimResponse;
    }
 
+ /**
+   * Search parameter: <b>identifier</b>
+   * <p>
+   * Description: <b>The identity of the insurer</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>ClaimResponse.identifier</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="identifier", path="ClaimResponse.identifier", description="The identity of the insurer", type="token" )
   public static final String SP_IDENTIFIER = "identifier";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>identifier</b>
+   * <p>
+   * Description: <b>The identity of the insurer</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>ClaimResponse.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
+
+ /**
+   * Search parameter: <b>request</b>
+   * <p>
+   * Description: <b>The claim reference</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>ClaimResponse.request</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="request", path="ClaimResponse.request", description="The claim reference", type="reference" )
   public static final String SP_REQUEST = "request";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>request</b>
+   * <p>
+   * Description: <b>The claim reference</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>ClaimResponse.request</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REQUEST = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REQUEST);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>ClaimResponse:request</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_REQUEST = new ca.uhn.fhir.model.api.Include("ClaimResponse:request").toLocked();
 
+ /**
+   * Search parameter: <b>disposition</b>
+   * <p>
+   * Description: <b>The contents of the disposition message</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>ClaimResponse.disposition</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="disposition", path="ClaimResponse.disposition", description="The contents of the disposition message", type="string" )
   public static final String SP_DISPOSITION = "disposition";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>disposition</b>
+   * <p>
+   * Description: <b>The contents of the disposition message</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>ClaimResponse.disposition</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.StringClientParam DISPOSITION = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_DISPOSITION);
+
+ /**
+   * Search parameter: <b>paymentdate</b>
+   * <p>
+   * Description: <b>The expected paymentDate</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>ClaimResponse.paymentDate</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="paymentdate", path="ClaimResponse.paymentDate", description="The expected paymentDate", type="date" )
   public static final String SP_PAYMENTDATE = "paymentdate";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>paymentdate</b>
+   * <p>
+   * Description: <b>The expected paymentDate</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>ClaimResponse.paymentDate</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam PAYMENTDATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_PAYMENTDATE);
+
+ /**
+   * Search parameter: <b>created</b>
+   * <p>
+   * Description: <b>The creation date</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>ClaimResponse.created</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="created", path="ClaimResponse.created", description="The creation date", type="date" )
   public static final String SP_CREATED = "created";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>created</b>
+   * <p>
+   * Description: <b>The creation date</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>ClaimResponse.created</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam CREATED = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_CREATED);
+
+ /**
+   * Search parameter: <b>organization</b>
+   * <p>
+   * Description: <b>The organization who generated this resource</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>ClaimResponse.organization</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="organization", path="ClaimResponse.organization", description="The organization who generated this resource", type="reference" )
   public static final String SP_ORGANIZATION = "organization";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>organization</b>
+   * <p>
+   * Description: <b>The organization who generated this resource</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>ClaimResponse.organization</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ORGANIZATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ORGANIZATION);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>ClaimResponse:organization</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_ORGANIZATION = new ca.uhn.fhir.model.api.Include("ClaimResponse:organization").toLocked();
 
+ /**
+   * Search parameter: <b>outcome</b>
+   * <p>
+   * Description: <b>The processing outcome</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>ClaimResponse.outcome</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="outcome", path="ClaimResponse.outcome", description="The processing outcome", type="token" )
   public static final String SP_OUTCOME = "outcome";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>outcome</b>
+   * <p>
+   * Description: <b>The processing outcome</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>ClaimResponse.outcome</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam OUTCOME = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_OUTCOME);
+
 
 }
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ClinicalImpression.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -1853,82 +1853,334 @@ public class ClinicalImpression extends DomainResource {
     return ResourceType.ClinicalImpression;
    }
 
+ /**
+   * Search parameter: <b>date</b>
+   * <p>
+   * Description: <b>When the assessment occurred</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>ClinicalImpression.date</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="date", path="ClinicalImpression.date", description="When the assessment occurred", type="date" )
   public static final String SP_DATE = "date";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>date</b>
+   * <p>
+   * Description: <b>When the assessment occurred</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>ClinicalImpression.date</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE);
+
+ /**
+   * Search parameter: <b>previous</b>
+   * <p>
+   * Description: <b>Reference to last assessment</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>ClinicalImpression.previous</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="previous", path="ClinicalImpression.previous", description="Reference to last assessment", type="reference" )
   public static final String SP_PREVIOUS = "previous";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>previous</b>
+   * <p>
+   * Description: <b>Reference to last assessment</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>ClinicalImpression.previous</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PREVIOUS = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PREVIOUS);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>ClinicalImpression:previous</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PREVIOUS = new ca.uhn.fhir.model.api.Include("ClinicalImpression:previous").toLocked();
 
+ /**
+   * Search parameter: <b>assessor</b>
+   * <p>
+   * Description: <b>The clinician performing the assessment</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>ClinicalImpression.assessor</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="assessor", path="ClinicalImpression.assessor", description="The clinician performing the assessment", type="reference" )
   public static final String SP_ASSESSOR = "assessor";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>assessor</b>
+   * <p>
+   * Description: <b>The clinician performing the assessment</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>ClinicalImpression.assessor</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ASSESSOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ASSESSOR);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>ClinicalImpression:assessor</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_ASSESSOR = new ca.uhn.fhir.model.api.Include("ClinicalImpression:assessor").toLocked();
 
+ /**
+   * Search parameter: <b>trigger</b>
+   * <p>
+   * Description: <b>Request or event that necessitated this assessment</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>ClinicalImpression.triggerReference</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="trigger", path="ClinicalImpression.triggerReference", description="Request or event that necessitated this assessment", type="reference" )
   public static final String SP_TRIGGER = "trigger";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>trigger</b>
+   * <p>
+   * Description: <b>Request or event that necessitated this assessment</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>ClinicalImpression.triggerReference</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam TRIGGER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_TRIGGER);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>ClinicalImpression:trigger</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_TRIGGER = new ca.uhn.fhir.model.api.Include("ClinicalImpression:trigger").toLocked();
 
+ /**
+   * Search parameter: <b>finding</b>
+   * <p>
+   * Description: <b>Specific text or code for finding</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>ClinicalImpression.finding.item</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="finding", path="ClinicalImpression.finding.item", description="Specific text or code for finding", type="token" )
   public static final String SP_FINDING = "finding";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>finding</b>
+   * <p>
+   * Description: <b>Specific text or code for finding</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>ClinicalImpression.finding.item</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam FINDING = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_FINDING);
+
+ /**
+   * Search parameter: <b>ruledout</b>
+   * <p>
+   * Description: <b>Specific text of code for diagnosis</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>ClinicalImpression.ruledOut.item</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="ruledout", path="ClinicalImpression.ruledOut.item", description="Specific text of code for diagnosis", type="token" )
   public static final String SP_RULEDOUT = "ruledout";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>ruledout</b>
+   * <p>
+   * Description: <b>Specific text of code for diagnosis</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>ClinicalImpression.ruledOut.item</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam RULEDOUT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_RULEDOUT);
+
+ /**
+   * Search parameter: <b>problem</b>
+   * <p>
+   * Description: <b>General assessment of patient state</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>ClinicalImpression.problem</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="problem", path="ClinicalImpression.problem", description="General assessment of patient state", type="reference" )
   public static final String SP_PROBLEM = "problem";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>problem</b>
+   * <p>
+   * Description: <b>General assessment of patient state</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>ClinicalImpression.problem</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PROBLEM = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PROBLEM);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>ClinicalImpression:problem</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PROBLEM = new ca.uhn.fhir.model.api.Include("ClinicalImpression:problem").toLocked();
 
+ /**
+   * Search parameter: <b>patient</b>
+   * <p>
+   * Description: <b>The patient being assessed</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>ClinicalImpression.patient</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="patient", path="ClinicalImpression.patient", description="The patient being assessed", type="reference" )
   public static final String SP_PATIENT = "patient";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>patient</b>
+   * <p>
+   * Description: <b>The patient being assessed</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>ClinicalImpression.patient</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>ClinicalImpression:patient</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("ClinicalImpression:patient").toLocked();
 
+ /**
+   * Search parameter: <b>investigation</b>
+   * <p>
+   * Description: <b>Record of a specific investigation</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>ClinicalImpression.investigations.item</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="investigation", path="ClinicalImpression.investigations.item", description="Record of a specific investigation", type="reference" )
   public static final String SP_INVESTIGATION = "investigation";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>investigation</b>
+   * <p>
+   * Description: <b>Record of a specific investigation</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>ClinicalImpression.investigations.item</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam INVESTIGATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_INVESTIGATION);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>ClinicalImpression:investigation</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_INVESTIGATION = new ca.uhn.fhir.model.api.Include("ClinicalImpression:investigation").toLocked();
 
+ /**
+   * Search parameter: <b>action</b>
+   * <p>
+   * Description: <b>Actions taken during assessment</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>ClinicalImpression.action</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="action", path="ClinicalImpression.action", description="Actions taken during assessment", type="reference" )
   public static final String SP_ACTION = "action";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>action</b>
+   * <p>
+   * Description: <b>Actions taken during assessment</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>ClinicalImpression.action</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ACTION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ACTION);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>ClinicalImpression:action</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_ACTION = new ca.uhn.fhir.model.api.Include("ClinicalImpression:action").toLocked();
 
+ /**
+   * Search parameter: <b>trigger-code</b>
+   * <p>
+   * Description: <b>Request or event that necessitated this assessment</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>ClinicalImpression.triggerCodeableConcept</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="trigger-code", path="ClinicalImpression.triggerCodeableConcept", description="Request or event that necessitated this assessment", type="token" )
   public static final String SP_TRIGGER_CODE = "trigger-code";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>trigger-code</b>
+   * <p>
+   * Description: <b>Request or event that necessitated this assessment</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>ClinicalImpression.triggerCodeableConcept</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam TRIGGER_CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TRIGGER_CODE);
+
+ /**
+   * Search parameter: <b>plan</b>
+   * <p>
+   * Description: <b>Plan of action after assessment</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>ClinicalImpression.plan</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="plan", path="ClinicalImpression.plan", description="Plan of action after assessment", type="reference" )
   public static final String SP_PLAN = "plan";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>plan</b>
+   * <p>
+   * Description: <b>Plan of action after assessment</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>ClinicalImpression.plan</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PLAN = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PLAN);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>ClinicalImpression:plan</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PLAN = new ca.uhn.fhir.model.api.Include("ClinicalImpression:plan").toLocked();
 
+ /**
+   * Search parameter: <b>resolved</b>
+   * <p>
+   * Description: <b>Diagnoses/conditions resolved since previous assessment</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>ClinicalImpression.resolved</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="resolved", path="ClinicalImpression.resolved", description="Diagnoses/conditions resolved since previous assessment", type="token" )
   public static final String SP_RESOLVED = "resolved";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>resolved</b>
+   * <p>
+   * Description: <b>Diagnoses/conditions resolved since previous assessment</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>ClinicalImpression.resolved</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam RESOLVED = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_RESOLVED);
+
+ /**
+   * Search parameter: <b>status</b>
+   * <p>
+   * Description: <b>in-progress | completed | entered-in-error</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>ClinicalImpression.status</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="status", path="ClinicalImpression.status", description="in-progress | completed | entered-in-error", type="token" )
   public static final String SP_STATUS = "status";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>status</b>
+   * <p>
+   * Description: <b>in-progress | completed | entered-in-error</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>ClinicalImpression.status</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS);
+
 
 }
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CodeableConcept.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Coding.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Communication.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -1197,66 +1197,282 @@ public class Communication extends DomainResource {
     return ResourceType.Communication;
    }
 
+ /**
+   * Search parameter: <b>identifier</b>
+   * <p>
+   * Description: <b>Unique identifier</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Communication.identifier</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="identifier", path="Communication.identifier", description="Unique identifier", type="token" )
   public static final String SP_IDENTIFIER = "identifier";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>identifier</b>
+   * <p>
+   * Description: <b>Unique identifier</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Communication.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
+
+ /**
+   * Search parameter: <b>request</b>
+   * <p>
+   * Description: <b>CommunicationRequest producing this message</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Communication.requestDetail</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="request", path="Communication.requestDetail", description="CommunicationRequest producing this message", type="reference" )
   public static final String SP_REQUEST = "request";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>request</b>
+   * <p>
+   * Description: <b>CommunicationRequest producing this message</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Communication.requestDetail</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REQUEST = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REQUEST);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Communication:request</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_REQUEST = new ca.uhn.fhir.model.api.Include("Communication:request").toLocked();
 
+ /**
+   * Search parameter: <b>sender</b>
+   * <p>
+   * Description: <b>Message sender</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Communication.sender</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="sender", path="Communication.sender", description="Message sender", type="reference" )
   public static final String SP_SENDER = "sender";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>sender</b>
+   * <p>
+   * Description: <b>Message sender</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Communication.sender</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SENDER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SENDER);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Communication:sender</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_SENDER = new ca.uhn.fhir.model.api.Include("Communication:sender").toLocked();
 
+ /**
+   * Search parameter: <b>subject</b>
+   * <p>
+   * Description: <b>Focus of message</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Communication.subject</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="subject", path="Communication.subject", description="Focus of message", type="reference" )
   public static final String SP_SUBJECT = "subject";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>subject</b>
+   * <p>
+   * Description: <b>Focus of message</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Communication.subject</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Communication:subject</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("Communication:subject").toLocked();
 
+ /**
+   * Search parameter: <b>patient</b>
+   * <p>
+   * Description: <b>Focus of message</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Communication.subject</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="patient", path="Communication.subject", description="Focus of message", type="reference" )
   public static final String SP_PATIENT = "patient";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>patient</b>
+   * <p>
+   * Description: <b>Focus of message</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Communication.subject</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Communication:patient</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Communication:patient").toLocked();
 
+ /**
+   * Search parameter: <b>recipient</b>
+   * <p>
+   * Description: <b>Message recipient</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Communication.recipient</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="recipient", path="Communication.recipient", description="Message recipient", type="reference" )
   public static final String SP_RECIPIENT = "recipient";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>recipient</b>
+   * <p>
+   * Description: <b>Message recipient</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Communication.recipient</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RECIPIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RECIPIENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Communication:recipient</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_RECIPIENT = new ca.uhn.fhir.model.api.Include("Communication:recipient").toLocked();
 
+ /**
+   * Search parameter: <b>received</b>
+   * <p>
+   * Description: <b>When received</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>Communication.received</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="received", path="Communication.received", description="When received", type="date" )
   public static final String SP_RECEIVED = "received";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>received</b>
+   * <p>
+   * Description: <b>When received</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>Communication.received</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam RECEIVED = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_RECEIVED);
+
+ /**
+   * Search parameter: <b>medium</b>
+   * <p>
+   * Description: <b>A channel of communication</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Communication.medium</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="medium", path="Communication.medium", description="A channel of communication", type="token" )
   public static final String SP_MEDIUM = "medium";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>medium</b>
+   * <p>
+   * Description: <b>A channel of communication</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Communication.medium</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam MEDIUM = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_MEDIUM);
+
+ /**
+   * Search parameter: <b>encounter</b>
+   * <p>
+   * Description: <b>Encounter leading to message</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Communication.encounter</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="encounter", path="Communication.encounter", description="Encounter leading to message", type="reference" )
   public static final String SP_ENCOUNTER = "encounter";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>encounter</b>
+   * <p>
+   * Description: <b>Encounter leading to message</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Communication.encounter</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENCOUNTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENCOUNTER);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Communication:encounter</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_ENCOUNTER = new ca.uhn.fhir.model.api.Include("Communication:encounter").toLocked();
 
+ /**
+   * Search parameter: <b>category</b>
+   * <p>
+   * Description: <b>Message category</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Communication.category</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="category", path="Communication.category", description="Message category", type="token" )
   public static final String SP_CATEGORY = "category";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>category</b>
+   * <p>
+   * Description: <b>Message category</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Communication.category</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam CATEGORY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CATEGORY);
+
+ /**
+   * Search parameter: <b>sent</b>
+   * <p>
+   * Description: <b>When sent</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>Communication.sent</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="sent", path="Communication.sent", description="When sent", type="date" )
   public static final String SP_SENT = "sent";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>sent</b>
+   * <p>
+   * Description: <b>When sent</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>Communication.sent</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam SENT = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_SENT);
+
+ /**
+   * Search parameter: <b>status</b>
+   * <p>
+   * Description: <b>in-progress | completed | suspended | rejected | failed</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Communication.status</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="status", path="Communication.status", description="in-progress | completed | suspended | rejected | failed", type="token" )
   public static final String SP_STATUS = "status";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>status</b>
+   * <p>
+   * Description: <b>in-progress | completed | suspended | rejected | failed</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Communication.status</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS);
+
 
 }
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/CommunicationRequest.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -1311,68 +1311,302 @@ public class CommunicationRequest extends DomainResource {
     return ResourceType.CommunicationRequest;
    }
 
+ /**
+   * Search parameter: <b>requester</b>
+   * <p>
+   * Description: <b>An individual who requested a communication</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>CommunicationRequest.requester</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="requester", path="CommunicationRequest.requester", description="An individual who requested a communication", type="reference" )
   public static final String SP_REQUESTER = "requester";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>requester</b>
+   * <p>
+   * Description: <b>An individual who requested a communication</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>CommunicationRequest.requester</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REQUESTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REQUESTER);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>CommunicationRequest:requester</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_REQUESTER = new ca.uhn.fhir.model.api.Include("CommunicationRequest:requester").toLocked();
 
+ /**
+   * Search parameter: <b>identifier</b>
+   * <p>
+   * Description: <b>Unique identifier</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>CommunicationRequest.identifier</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="identifier", path="CommunicationRequest.identifier", description="Unique identifier", type="token" )
   public static final String SP_IDENTIFIER = "identifier";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>identifier</b>
+   * <p>
+   * Description: <b>Unique identifier</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>CommunicationRequest.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
+
+ /**
+   * Search parameter: <b>subject</b>
+   * <p>
+   * Description: <b>Focus of message</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>CommunicationRequest.subject</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="subject", path="CommunicationRequest.subject", description="Focus of message", type="reference" )
   public static final String SP_SUBJECT = "subject";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>subject</b>
+   * <p>
+   * Description: <b>Focus of message</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>CommunicationRequest.subject</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>CommunicationRequest:subject</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("CommunicationRequest:subject").toLocked();
 
+ /**
+   * Search parameter: <b>medium</b>
+   * <p>
+   * Description: <b>A channel of communication</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>CommunicationRequest.medium</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="medium", path="CommunicationRequest.medium", description="A channel of communication", type="token" )
   public static final String SP_MEDIUM = "medium";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>medium</b>
+   * <p>
+   * Description: <b>A channel of communication</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>CommunicationRequest.medium</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam MEDIUM = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_MEDIUM);
+
+ /**
+   * Search parameter: <b>encounter</b>
+   * <p>
+   * Description: <b>Encounter leading to message</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>CommunicationRequest.encounter</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="encounter", path="CommunicationRequest.encounter", description="Encounter leading to message", type="reference" )
   public static final String SP_ENCOUNTER = "encounter";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>encounter</b>
+   * <p>
+   * Description: <b>Encounter leading to message</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>CommunicationRequest.encounter</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENCOUNTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENCOUNTER);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>CommunicationRequest:encounter</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_ENCOUNTER = new ca.uhn.fhir.model.api.Include("CommunicationRequest:encounter").toLocked();
 
+ /**
+   * Search parameter: <b>priority</b>
+   * <p>
+   * Description: <b>Message urgency</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>CommunicationRequest.priority</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="priority", path="CommunicationRequest.priority", description="Message urgency", type="token" )
   public static final String SP_PRIORITY = "priority";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>priority</b>
+   * <p>
+   * Description: <b>Message urgency</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>CommunicationRequest.priority</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam PRIORITY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_PRIORITY);
+
+ /**
+   * Search parameter: <b>requested</b>
+   * <p>
+   * Description: <b>When ordered or proposed</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>CommunicationRequest.requestedOn</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="requested", path="CommunicationRequest.requestedOn", description="When ordered or proposed", type="date" )
   public static final String SP_REQUESTED = "requested";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>requested</b>
+   * <p>
+   * Description: <b>When ordered or proposed</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>CommunicationRequest.requestedOn</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam REQUESTED = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_REQUESTED);
+
+ /**
+   * Search parameter: <b>sender</b>
+   * <p>
+   * Description: <b>Message sender</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>CommunicationRequest.sender</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="sender", path="CommunicationRequest.sender", description="Message sender", type="reference" )
   public static final String SP_SENDER = "sender";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>sender</b>
+   * <p>
+   * Description: <b>Message sender</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>CommunicationRequest.sender</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SENDER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SENDER);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>CommunicationRequest:sender</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_SENDER = new ca.uhn.fhir.model.api.Include("CommunicationRequest:sender").toLocked();
 
+ /**
+   * Search parameter: <b>patient</b>
+   * <p>
+   * Description: <b>Focus of message</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>CommunicationRequest.subject</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="patient", path="CommunicationRequest.subject", description="Focus of message", type="reference" )
   public static final String SP_PATIENT = "patient";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>patient</b>
+   * <p>
+   * Description: <b>Focus of message</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>CommunicationRequest.subject</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>CommunicationRequest:patient</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("CommunicationRequest:patient").toLocked();
 
+ /**
+   * Search parameter: <b>recipient</b>
+   * <p>
+   * Description: <b>Message recipient</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>CommunicationRequest.recipient</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="recipient", path="CommunicationRequest.recipient", description="Message recipient", type="reference" )
   public static final String SP_RECIPIENT = "recipient";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>recipient</b>
+   * <p>
+   * Description: <b>Message recipient</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>CommunicationRequest.recipient</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RECIPIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RECIPIENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>CommunicationRequest:recipient</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_RECIPIENT = new ca.uhn.fhir.model.api.Include("CommunicationRequest:recipient").toLocked();
 
+ /**
+   * Search parameter: <b>time</b>
+   * <p>
+   * Description: <b>When scheduled</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>CommunicationRequest.scheduledDateTime</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="time", path="CommunicationRequest.scheduledDateTime", description="When scheduled", type="date" )
   public static final String SP_TIME = "time";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>time</b>
+   * <p>
+   * Description: <b>When scheduled</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>CommunicationRequest.scheduledDateTime</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam TIME = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_TIME);
+
+ /**
+   * Search parameter: <b>category</b>
+   * <p>
+   * Description: <b>Message category</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>CommunicationRequest.category</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="category", path="CommunicationRequest.category", description="Message category", type="token" )
   public static final String SP_CATEGORY = "category";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>category</b>
+   * <p>
+   * Description: <b>Message category</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>CommunicationRequest.category</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam CATEGORY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CATEGORY);
+
+ /**
+   * Search parameter: <b>status</b>
+   * <p>
+   * Description: <b>proposed | planned | requested | received | accepted | in-progress | completed | suspended | rejected | failed</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>CommunicationRequest.status</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="status", path="CommunicationRequest.status", description="proposed | planned | requested | received | accepted | in-progress | completed | suspended | rejected | failed", type="token" )
   public static final String SP_STATUS = "status";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>status</b>
+   * <p>
+   * Description: <b>proposed | planned | requested | received | accepted | in-progress | completed | suspended | rejected | failed</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>CommunicationRequest.status</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS);
+
 
 }
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Composition.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -2143,74 +2143,362 @@ public class Composition extends DomainResource {
     return ResourceType.Composition;
    }
 
+ /**
+   * Search parameter: <b>date</b>
+   * <p>
+   * Description: <b>Composition editing time</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>Composition.date</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="date", path="Composition.date", description="Composition editing time", type="date" )
   public static final String SP_DATE = "date";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>date</b>
+   * <p>
+   * Description: <b>Composition editing time</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>Composition.date</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE);
+
+ /**
+   * Search parameter: <b>identifier</b>
+   * <p>
+   * Description: <b>Logical identifier of composition (version-independent)</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Composition.identifier</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="identifier", path="Composition.identifier", description="Logical identifier of composition (version-independent)", type="token" )
   public static final String SP_IDENTIFIER = "identifier";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>identifier</b>
+   * <p>
+   * Description: <b>Logical identifier of composition (version-independent)</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Composition.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
+
+ /**
+   * Search parameter: <b>period</b>
+   * <p>
+   * Description: <b>The period covered by the documentation</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>Composition.event.period</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="period", path="Composition.event.period", description="The period covered by the documentation", type="date" )
   public static final String SP_PERIOD = "period";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>period</b>
+   * <p>
+   * Description: <b>The period covered by the documentation</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>Composition.event.period</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam PERIOD = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_PERIOD);
+
+ /**
+   * Search parameter: <b>subject</b>
+   * <p>
+   * Description: <b>Who and/or what the composition is about</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Composition.subject</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="subject", path="Composition.subject", description="Who and/or what the composition is about", type="reference" )
   public static final String SP_SUBJECT = "subject";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>subject</b>
+   * <p>
+   * Description: <b>Who and/or what the composition is about</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Composition.subject</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Composition:subject</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("Composition:subject").toLocked();
 
+ /**
+   * Search parameter: <b>author</b>
+   * <p>
+   * Description: <b>Who and/or what authored the composition</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Composition.author</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="author", path="Composition.author", description="Who and/or what authored the composition", type="reference" )
   public static final String SP_AUTHOR = "author";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>author</b>
+   * <p>
+   * Description: <b>Who and/or what authored the composition</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Composition.author</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam AUTHOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_AUTHOR);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Composition:author</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_AUTHOR = new ca.uhn.fhir.model.api.Include("Composition:author").toLocked();
 
+ /**
+   * Search parameter: <b>confidentiality</b>
+   * <p>
+   * Description: <b>As defined by affinity domain</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Composition.confidentiality</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="confidentiality", path="Composition.confidentiality", description="As defined by affinity domain", type="token" )
   public static final String SP_CONFIDENTIALITY = "confidentiality";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>confidentiality</b>
+   * <p>
+   * Description: <b>As defined by affinity domain</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Composition.confidentiality</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONFIDENTIALITY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONFIDENTIALITY);
+
+ /**
+   * Search parameter: <b>section</b>
+   * <p>
+   * Description: <b>Classification of section (recommended)</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Composition.section.code</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="section", path="Composition.section.code", description="Classification of section (recommended)", type="token" )
   public static final String SP_SECTION = "section";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>section</b>
+   * <p>
+   * Description: <b>Classification of section (recommended)</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Composition.section.code</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam SECTION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SECTION);
+
+ /**
+   * Search parameter: <b>encounter</b>
+   * <p>
+   * Description: <b>Context of the Composition</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Composition.encounter</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="encounter", path="Composition.encounter", description="Context of the Composition", type="reference" )
   public static final String SP_ENCOUNTER = "encounter";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>encounter</b>
+   * <p>
+   * Description: <b>Context of the Composition</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Composition.encounter</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENCOUNTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENCOUNTER);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Composition:encounter</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_ENCOUNTER = new ca.uhn.fhir.model.api.Include("Composition:encounter").toLocked();
 
+ /**
+   * Search parameter: <b>type</b>
+   * <p>
+   * Description: <b>Kind of composition (LOINC if possible)</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Composition.type</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="type", path="Composition.type", description="Kind of composition (LOINC if possible)", type="token" )
   public static final String SP_TYPE = "type";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>type</b>
+   * <p>
+   * Description: <b>Kind of composition (LOINC if possible)</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Composition.type</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE);
+
+ /**
+   * Search parameter: <b>title</b>
+   * <p>
+   * Description: <b>Human Readable name/title</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>Composition.title</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="title", path="Composition.title", description="Human Readable name/title", type="string" )
   public static final String SP_TITLE = "title";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>title</b>
+   * <p>
+   * Description: <b>Human Readable name/title</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>Composition.title</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.StringClientParam TITLE = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_TITLE);
+
+ /**
+   * Search parameter: <b>attester</b>
+   * <p>
+   * Description: <b>Who attested the composition</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Composition.attester.party</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="attester", path="Composition.attester.party", description="Who attested the composition", type="reference" )
   public static final String SP_ATTESTER = "attester";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>attester</b>
+   * <p>
+   * Description: <b>Who attested the composition</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Composition.attester.party</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ATTESTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ATTESTER);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Composition:attester</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_ATTESTER = new ca.uhn.fhir.model.api.Include("Composition:attester").toLocked();
 
+ /**
+   * Search parameter: <b>entry</b>
+   * <p>
+   * Description: <b>A reference to data that supports this section</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Composition.section.entry</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="entry", path="Composition.section.entry", description="A reference to data that supports this section", type="reference" )
   public static final String SP_ENTRY = "entry";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>entry</b>
+   * <p>
+   * Description: <b>A reference to data that supports this section</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Composition.section.entry</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENTRY = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENTRY);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Composition:entry</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_ENTRY = new ca.uhn.fhir.model.api.Include("Composition:entry").toLocked();
 
+ /**
+   * Search parameter: <b>patient</b>
+   * <p>
+   * Description: <b>Who and/or what the composition is about</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Composition.subject</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="patient", path="Composition.subject", description="Who and/or what the composition is about", type="reference" )
   public static final String SP_PATIENT = "patient";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>patient</b>
+   * <p>
+   * Description: <b>Who and/or what the composition is about</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Composition.subject</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Composition:patient</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Composition:patient").toLocked();
 
+ /**
+   * Search parameter: <b>context</b>
+   * <p>
+   * Description: <b>Code(s) that apply to the event being documented</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Composition.event.code</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="context", path="Composition.event.code", description="Code(s) that apply to the event being documented", type="token" )
   public static final String SP_CONTEXT = "context";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>context</b>
+   * <p>
+   * Description: <b>Code(s) that apply to the event being documented</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Composition.event.code</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONTEXT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONTEXT);
+
+ /**
+   * Search parameter: <b>class</b>
+   * <p>
+   * Description: <b>Categorization of Composition</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Composition.class</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="class", path="Composition.class", description="Categorization of Composition", type="token" )
   public static final String SP_CLASS = "class";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>class</b>
+   * <p>
+   * Description: <b>Categorization of Composition</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Composition.class</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam CLASS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CLASS);
+
+ /**
+   * Search parameter: <b>status</b>
+   * <p>
+   * Description: <b>preliminary | final | amended | entered-in-error</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Composition.status</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="status", path="Composition.status", description="preliminary | final | amended | entered-in-error", type="token" )
   public static final String SP_STATUS = "status";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>status</b>
+   * <p>
+   * Description: <b>preliminary | final | amended | entered-in-error</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Composition.status</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS);
+
 
 }
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ConceptMap.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -2236,60 +2236,384 @@ public class ConceptMap extends DomainResource {
     return ResourceType.ConceptMap;
    }
 
+ /**
+   * Search parameter: <b>date</b>
+   * <p>
+   * Description: <b>The concept map publication date</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>ConceptMap.date</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="date", path="ConceptMap.date", description="The concept map publication date", type="date" )
   public static final String SP_DATE = "date";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>date</b>
+   * <p>
+   * Description: <b>The concept map publication date</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>ConceptMap.date</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE);
+
+ /**
+   * Search parameter: <b>identifier</b>
+   * <p>
+   * Description: <b>Additional identifier for the concept map</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>ConceptMap.identifier</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="identifier", path="ConceptMap.identifier", description="Additional identifier for the concept map", type="token" )
   public static final String SP_IDENTIFIER = "identifier";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>identifier</b>
+   * <p>
+   * Description: <b>Additional identifier for the concept map</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>ConceptMap.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
+
+ /**
+   * Search parameter: <b>product</b>
+   * <p>
+   * Description: <b>Reference to element/field/ValueSet mapping depends on</b><br>
+   * Type: <b>uri</b><br>
+   * Path: <b>ConceptMap.element.target.product.element</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="product", path="ConceptMap.element.target.product.element", description="Reference to element/field/ValueSet mapping depends on", type="uri" )
   public static final String SP_PRODUCT = "product";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>product</b>
+   * <p>
+   * Description: <b>Reference to element/field/ValueSet mapping depends on</b><br>
+   * Type: <b>uri</b><br>
+   * Path: <b>ConceptMap.element.target.product.element</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.UriClientParam PRODUCT = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_PRODUCT);
+
+ /**
+   * Search parameter: <b>dependson</b>
+   * <p>
+   * Description: <b>Reference to element/field/ValueSet mapping depends on</b><br>
+   * Type: <b>uri</b><br>
+   * Path: <b>ConceptMap.element.target.dependsOn.element</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="dependson", path="ConceptMap.element.target.dependsOn.element", description="Reference to element/field/ValueSet mapping depends on", type="uri" )
   public static final String SP_DEPENDSON = "dependson";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>dependson</b>
+   * <p>
+   * Description: <b>Reference to element/field/ValueSet mapping depends on</b><br>
+   * Type: <b>uri</b><br>
+   * Path: <b>ConceptMap.element.target.dependsOn.element</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.UriClientParam DEPENDSON = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_DEPENDSON);
+
+ /**
+   * Search parameter: <b>description</b>
+   * <p>
+   * Description: <b>Text search in the description of the concept map</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>ConceptMap.description</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="description", path="ConceptMap.description", description="Text search in the description of the concept map", type="string" )
   public static final String SP_DESCRIPTION = "description";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>description</b>
+   * <p>
+   * Description: <b>Text search in the description of the concept map</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>ConceptMap.description</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.StringClientParam DESCRIPTION = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_DESCRIPTION);
+
+ /**
+   * Search parameter: <b>targetsystem</b>
+   * <p>
+   * Description: <b>System of the target (if necessary)</b><br>
+   * Type: <b>uri</b><br>
+   * Path: <b>ConceptMap.element.target.codeSystem</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="targetsystem", path="ConceptMap.element.target.codeSystem", description="System of the target (if necessary)", type="uri" )
   public static final String SP_TARGETSYSTEM = "targetsystem";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>targetsystem</b>
+   * <p>
+   * Description: <b>System of the target (if necessary)</b><br>
+   * Type: <b>uri</b><br>
+   * Path: <b>ConceptMap.element.target.codeSystem</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.UriClientParam TARGETSYSTEM = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_TARGETSYSTEM);
+
+ /**
+   * Search parameter: <b>source</b>
+   * <p>
+   * Description: <b>Identifies the source of the concepts which are being mapped</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>ConceptMap.sourceReference</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="source", path="ConceptMap.sourceReference", description="Identifies the source of the concepts which are being mapped", type="reference" )
   public static final String SP_SOURCE = "source";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>source</b>
+   * <p>
+   * Description: <b>Identifies the source of the concepts which are being mapped</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>ConceptMap.sourceReference</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SOURCE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SOURCE);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>ConceptMap:source</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_SOURCE = new ca.uhn.fhir.model.api.Include("ConceptMap:source").toLocked();
 
+ /**
+   * Search parameter: <b>version</b>
+   * <p>
+   * Description: <b>The version identifier of the concept map</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>ConceptMap.version</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="version", path="ConceptMap.version", description="The version identifier of the concept map", type="token" )
   public static final String SP_VERSION = "version";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>version</b>
+   * <p>
+   * Description: <b>The version identifier of the concept map</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>ConceptMap.version</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam VERSION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VERSION);
+
+ /**
+   * Search parameter: <b>sourcesystem</b>
+   * <p>
+   * Description: <b>Code System (if value set crosses code systems)</b><br>
+   * Type: <b>uri</b><br>
+   * Path: <b>ConceptMap.element.codeSystem</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="sourcesystem", path="ConceptMap.element.codeSystem", description="Code System (if value set crosses code systems)", type="uri" )
   public static final String SP_SOURCESYSTEM = "sourcesystem";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>sourcesystem</b>
+   * <p>
+   * Description: <b>Code System (if value set crosses code systems)</b><br>
+   * Type: <b>uri</b><br>
+   * Path: <b>ConceptMap.element.codeSystem</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.UriClientParam SOURCESYSTEM = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_SOURCESYSTEM);
+
+ /**
+   * Search parameter: <b>url</b>
+   * <p>
+   * Description: <b>The URL of the concept map</b><br>
+   * Type: <b>uri</b><br>
+   * Path: <b>ConceptMap.url</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="url", path="ConceptMap.url", description="The URL of the concept map", type="uri" )
   public static final String SP_URL = "url";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>url</b>
+   * <p>
+   * Description: <b>The URL of the concept map</b><br>
+   * Type: <b>uri</b><br>
+   * Path: <b>ConceptMap.url</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.UriClientParam URL = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_URL);
+
+ /**
+   * Search parameter: <b>target</b>
+   * <p>
+   * Description: <b>Provides context to the mappings</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>ConceptMap.target[x]</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="target", path="ConceptMap.target[x]", description="Provides context to the mappings", type="reference" )
   public static final String SP_TARGET = "target";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>target</b>
+   * <p>
+   * Description: <b>Provides context to the mappings</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>ConceptMap.target[x]</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam TARGET = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_TARGET);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>ConceptMap:target</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_TARGET = new ca.uhn.fhir.model.api.Include("ConceptMap:target").toLocked();
 
+ /**
+   * Search parameter: <b>sourcecode</b>
+   * <p>
+   * Description: <b>Identifies element being mapped</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>ConceptMap.element.code</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="sourcecode", path="ConceptMap.element.code", description="Identifies element being mapped", type="token" )
   public static final String SP_SOURCECODE = "sourcecode";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>sourcecode</b>
+   * <p>
+   * Description: <b>Identifies element being mapped</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>ConceptMap.element.code</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam SOURCECODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SOURCECODE);
+
+ /**
+   * Search parameter: <b>sourceuri</b>
+   * <p>
+   * Description: <b>Identifies the source of the concepts which are being mapped</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>ConceptMap.sourceUri</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="sourceuri", path="ConceptMap.sourceUri", description="Identifies the source of the concepts which are being mapped", type="reference" )
   public static final String SP_SOURCEURI = "sourceuri";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>sourceuri</b>
+   * <p>
+   * Description: <b>Identifies the source of the concepts which are being mapped</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>ConceptMap.sourceUri</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SOURCEURI = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SOURCEURI);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>ConceptMap:sourceuri</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_SOURCEURI = new ca.uhn.fhir.model.api.Include("ConceptMap:sourceuri").toLocked();
 
+ /**
+   * Search parameter: <b>name</b>
+   * <p>
+   * Description: <b>Name of the concept map</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>ConceptMap.name</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="name", path="ConceptMap.name", description="Name of the concept map", type="string" )
   public static final String SP_NAME = "name";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>name</b>
+   * <p>
+   * Description: <b>Name of the concept map</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>ConceptMap.name</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.StringClientParam NAME = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_NAME);
+
+ /**
+   * Search parameter: <b>context</b>
+   * <p>
+   * Description: <b>A use context assigned to the concept map</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>ConceptMap.useContext</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="context", path="ConceptMap.useContext", description="A use context assigned to the concept map", type="token" )
   public static final String SP_CONTEXT = "context";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>context</b>
+   * <p>
+   * Description: <b>A use context assigned to the concept map</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>ConceptMap.useContext</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONTEXT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONTEXT);
+
+ /**
+   * Search parameter: <b>publisher</b>
+   * <p>
+   * Description: <b>Name of the publisher of the concept map</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>ConceptMap.publisher</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="publisher", path="ConceptMap.publisher", description="Name of the publisher of the concept map", type="string" )
   public static final String SP_PUBLISHER = "publisher";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>publisher</b>
+   * <p>
+   * Description: <b>Name of the publisher of the concept map</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>ConceptMap.publisher</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.StringClientParam PUBLISHER = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_PUBLISHER);
+
+ /**
+   * Search parameter: <b>targetcode</b>
+   * <p>
+   * Description: <b>Code that identifies the target element</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>ConceptMap.element.target.code</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="targetcode", path="ConceptMap.element.target.code", description="Code that identifies the target element", type="token" )
   public static final String SP_TARGETCODE = "targetcode";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>targetcode</b>
+   * <p>
+   * Description: <b>Code that identifies the target element</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>ConceptMap.element.target.code</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam TARGETCODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TARGETCODE);
+
+ /**
+   * Search parameter: <b>status</b>
+   * <p>
+   * Description: <b>Status of the concept map</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>ConceptMap.status</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="status", path="ConceptMap.status", description="Status of the concept map", type="token" )
   public static final String SP_STATUS = "status";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>status</b>
+   * <p>
+   * Description: <b>Status of the concept map</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>ConceptMap.status</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS);
+
 
 }
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Condition.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -1655,52 +1655,304 @@ public class Condition extends DomainResource {
     return ResourceType.Condition;
    }
 
+ /**
+   * Search parameter: <b>severity</b>
+   * <p>
+   * Description: <b>The severity of the condition</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Condition.severity</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="severity", path="Condition.severity", description="The severity of the condition", type="token" )
   public static final String SP_SEVERITY = "severity";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>severity</b>
+   * <p>
+   * Description: <b>The severity of the condition</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Condition.severity</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam SEVERITY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SEVERITY);
+
+ /**
+   * Search parameter: <b>identifier</b>
+   * <p>
+   * Description: <b>A unique identifier of the condition record</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Condition.identifier</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="identifier", path="Condition.identifier", description="A unique identifier of the condition record", type="token" )
   public static final String SP_IDENTIFIER = "identifier";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>identifier</b>
+   * <p>
+   * Description: <b>A unique identifier of the condition record</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Condition.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
+
+ /**
+   * Search parameter: <b>clinicalstatus</b>
+   * <p>
+   * Description: <b>The clinical status of the condition</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Condition.clinicalStatus</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="clinicalstatus", path="Condition.clinicalStatus", description="The clinical status of the condition", type="token" )
   public static final String SP_CLINICALSTATUS = "clinicalstatus";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>clinicalstatus</b>
+   * <p>
+   * Description: <b>The clinical status of the condition</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Condition.clinicalStatus</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam CLINICALSTATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CLINICALSTATUS);
+
+ /**
+   * Search parameter: <b>onset-info</b>
+   * <p>
+   * Description: <b>Other onsets (boolean, age, range, string)</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>Condition.onset[x]</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="onset-info", path="Condition.onset[x]", description="Other onsets (boolean, age, range, string)", type="string" )
   public static final String SP_ONSET_INFO = "onset-info";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>onset-info</b>
+   * <p>
+   * Description: <b>Other onsets (boolean, age, range, string)</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>Condition.onset[x]</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.StringClientParam ONSET_INFO = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_ONSET_INFO);
+
+ /**
+   * Search parameter: <b>code</b>
+   * <p>
+   * Description: <b>Code for the condition</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Condition.code</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="code", path="Condition.code", description="Code for the condition", type="token" )
   public static final String SP_CODE = "code";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>code</b>
+   * <p>
+   * Description: <b>Code for the condition</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Condition.code</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CODE);
+
+ /**
+   * Search parameter: <b>evidence</b>
+   * <p>
+   * Description: <b>Manifestation/symptom</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Condition.evidence.code</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="evidence", path="Condition.evidence.code", description="Manifestation/symptom", type="token" )
   public static final String SP_EVIDENCE = "evidence";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>evidence</b>
+   * <p>
+   * Description: <b>Manifestation/symptom</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Condition.evidence.code</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam EVIDENCE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_EVIDENCE);
+
+ /**
+   * Search parameter: <b>encounter</b>
+   * <p>
+   * Description: <b>Encounter when condition first asserted</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Condition.encounter</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="encounter", path="Condition.encounter", description="Encounter when condition first asserted", type="reference" )
   public static final String SP_ENCOUNTER = "encounter";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>encounter</b>
+   * <p>
+   * Description: <b>Encounter when condition first asserted</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Condition.encounter</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENCOUNTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENCOUNTER);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Condition:encounter</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_ENCOUNTER = new ca.uhn.fhir.model.api.Include("Condition:encounter").toLocked();
 
+ /**
+   * Search parameter: <b>onset</b>
+   * <p>
+   * Description: <b>Date related onsets (dateTime and Period)</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>Condition.onset[x]</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="onset", path="Condition.onset[x]", description="Date related onsets (dateTime and Period)", type="date" )
   public static final String SP_ONSET = "onset";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>onset</b>
+   * <p>
+   * Description: <b>Date related onsets (dateTime and Period)</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>Condition.onset[x]</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam ONSET = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_ONSET);
+
+ /**
+   * Search parameter: <b>asserter</b>
+   * <p>
+   * Description: <b>Person who asserts this condition</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Condition.asserter</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="asserter", path="Condition.asserter", description="Person who asserts this condition", type="reference" )
   public static final String SP_ASSERTER = "asserter";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>asserter</b>
+   * <p>
+   * Description: <b>Person who asserts this condition</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Condition.asserter</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ASSERTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ASSERTER);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Condition:asserter</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_ASSERTER = new ca.uhn.fhir.model.api.Include("Condition:asserter").toLocked();
 
+ /**
+   * Search parameter: <b>date-recorded</b>
+   * <p>
+   * Description: <b>A date, when the Condition statement was documented</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>Condition.dateRecorded</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="date-recorded", path="Condition.dateRecorded", description="A date, when the Condition statement was documented", type="date" )
   public static final String SP_DATE_RECORDED = "date-recorded";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>date-recorded</b>
+   * <p>
+   * Description: <b>A date, when the Condition statement was documented</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>Condition.dateRecorded</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE_RECORDED = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE_RECORDED);
+
+ /**
+   * Search parameter: <b>stage</b>
+   * <p>
+   * Description: <b>Simple summary (disease specific)</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Condition.stage.summary</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="stage", path="Condition.stage.summary", description="Simple summary (disease specific)", type="token" )
   public static final String SP_STAGE = "stage";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>stage</b>
+   * <p>
+   * Description: <b>Simple summary (disease specific)</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Condition.stage.summary</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam STAGE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STAGE);
+
+ /**
+   * Search parameter: <b>patient</b>
+   * <p>
+   * Description: <b>Who has the condition?</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Condition.patient</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="patient", path="Condition.patient", description="Who has the condition?", type="reference" )
   public static final String SP_PATIENT = "patient";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>patient</b>
+   * <p>
+   * Description: <b>Who has the condition?</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Condition.patient</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Condition:patient</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Condition:patient").toLocked();
 
+ /**
+   * Search parameter: <b>category</b>
+   * <p>
+   * Description: <b>The category of the condition</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Condition.category</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="category", path="Condition.category", description="The category of the condition", type="token" )
   public static final String SP_CATEGORY = "category";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>category</b>
+   * <p>
+   * Description: <b>The category of the condition</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Condition.category</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam CATEGORY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CATEGORY);
+
+ /**
+   * Search parameter: <b>body-site</b>
+   * <p>
+   * Description: <b>Anatomical location, if relevant</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Condition.bodySite</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="body-site", path="Condition.bodySite", description="Anatomical location, if relevant", type="token" )
   public static final String SP_BODY_SITE = "body-site";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>body-site</b>
+   * <p>
+   * Description: <b>Anatomical location, if relevant</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Condition.bodySite</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam BODY_SITE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_BODY_SITE);
+
 
 }
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Conformance.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -7776,50 +7776,338 @@ public class Conformance extends DomainResource implements IBaseConformance {
     return ResourceType.Conformance;
    }
 
+ /**
+   * Search parameter: <b>date</b>
+   * <p>
+   * Description: <b>The conformance statement publication date</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>Conformance.date</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="date", path="Conformance.date", description="The conformance statement publication date", type="date" )
   public static final String SP_DATE = "date";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>date</b>
+   * <p>
+   * Description: <b>The conformance statement publication date</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>Conformance.date</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE);
+
+ /**
+   * Search parameter: <b>software</b>
+   * <p>
+   * Description: <b>Part of a the name of a software application</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>Conformance.software.name</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="software", path="Conformance.software.name", description="Part of a the name of a software application", type="string" )
   public static final String SP_SOFTWARE = "software";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>software</b>
+   * <p>
+   * Description: <b>Part of a the name of a software application</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>Conformance.software.name</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.StringClientParam SOFTWARE = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_SOFTWARE);
+
+ /**
+   * Search parameter: <b>resource</b>
+   * <p>
+   * Description: <b>Name of a resource mentioned in a conformance statement</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Conformance.rest.resource.type</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="resource", path="Conformance.rest.resource.type", description="Name of a resource mentioned in a conformance statement", type="token" )
   public static final String SP_RESOURCE = "resource";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>resource</b>
+   * <p>
+   * Description: <b>Name of a resource mentioned in a conformance statement</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Conformance.rest.resource.type</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam RESOURCE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_RESOURCE);
+
+ /**
+   * Search parameter: <b>profile</b>
+   * <p>
+   * Description: <b>A profile id invoked in a conformance statement</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Conformance.rest.resource.profile</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="profile", path="Conformance.rest.resource.profile", description="A profile id invoked in a conformance statement", type="reference" )
   public static final String SP_PROFILE = "profile";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>profile</b>
+   * <p>
+   * Description: <b>A profile id invoked in a conformance statement</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Conformance.rest.resource.profile</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PROFILE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PROFILE);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Conformance:profile</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PROFILE = new ca.uhn.fhir.model.api.Include("Conformance:profile").toLocked();
 
+ /**
+   * Search parameter: <b>format</b>
+   * <p>
+   * Description: <b>formats supported (xml | json | mime type)</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Conformance.format</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="format", path="Conformance.format", description="formats supported (xml | json | mime type)", type="token" )
   public static final String SP_FORMAT = "format";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>format</b>
+   * <p>
+   * Description: <b>formats supported (xml | json | mime type)</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Conformance.format</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam FORMAT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_FORMAT);
+
+ /**
+   * Search parameter: <b>description</b>
+   * <p>
+   * Description: <b>Text search in the description of the conformance statement</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>Conformance.description</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="description", path="Conformance.description", description="Text search in the description of the conformance statement", type="string" )
   public static final String SP_DESCRIPTION = "description";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>description</b>
+   * <p>
+   * Description: <b>Text search in the description of the conformance statement</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>Conformance.description</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.StringClientParam DESCRIPTION = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_DESCRIPTION);
+
+ /**
+   * Search parameter: <b>fhirversion</b>
+   * <p>
+   * Description: <b>The version of FHIR</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Conformance.version</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="fhirversion", path="Conformance.version", description="The version of FHIR", type="token" )
   public static final String SP_FHIRVERSION = "fhirversion";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>fhirversion</b>
+   * <p>
+   * Description: <b>The version of FHIR</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Conformance.version</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam FHIRVERSION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_FHIRVERSION);
+
+ /**
+   * Search parameter: <b>version</b>
+   * <p>
+   * Description: <b>The version identifier of the conformance statement</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Conformance.version</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="version", path="Conformance.version", description="The version identifier of the conformance statement", type="token" )
   public static final String SP_VERSION = "version";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>version</b>
+   * <p>
+   * Description: <b>The version identifier of the conformance statement</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Conformance.version</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam VERSION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VERSION);
+
+ /**
+   * Search parameter: <b>url</b>
+   * <p>
+   * Description: <b>The uri that identifies the conformance statement</b><br>
+   * Type: <b>uri</b><br>
+   * Path: <b>Conformance.url</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="url", path="Conformance.url", description="The uri that identifies the conformance statement", type="uri" )
   public static final String SP_URL = "url";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>url</b>
+   * <p>
+   * Description: <b>The uri that identifies the conformance statement</b><br>
+   * Type: <b>uri</b><br>
+   * Path: <b>Conformance.url</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.UriClientParam URL = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_URL);
+
+ /**
+   * Search parameter: <b>supported-profile</b>
+   * <p>
+   * Description: <b>Profiles for use cases supported</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Conformance.profile</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="supported-profile", path="Conformance.profile", description="Profiles for use cases supported", type="reference" )
   public static final String SP_SUPPORTED_PROFILE = "supported-profile";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>supported-profile</b>
+   * <p>
+   * Description: <b>Profiles for use cases supported</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Conformance.profile</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUPPORTED_PROFILE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUPPORTED_PROFILE);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Conformance:supported-profile</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_SUPPORTED_PROFILE = new ca.uhn.fhir.model.api.Include("Conformance:supported-profile").toLocked();
 
+ /**
+   * Search parameter: <b>mode</b>
+   * <p>
+   * Description: <b>Mode - restful (server/client) or messaging (sender/receiver)</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Conformance.rest.mode</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="mode", path="Conformance.rest.mode", description="Mode - restful (server/client) or messaging (sender/receiver)", type="token" )
   public static final String SP_MODE = "mode";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>mode</b>
+   * <p>
+   * Description: <b>Mode - restful (server/client) or messaging (sender/receiver)</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Conformance.rest.mode</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam MODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_MODE);
+
+ /**
+   * Search parameter: <b>security</b>
+   * <p>
+   * Description: <b>OAuth | SMART-on-FHIR | NTLM | Basic | Kerberos | Certificates</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Conformance.rest.security.service</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="security", path="Conformance.rest.security.service", description="OAuth | SMART-on-FHIR | NTLM | Basic | Kerberos | Certificates", type="token" )
   public static final String SP_SECURITY = "security";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>security</b>
+   * <p>
+   * Description: <b>OAuth | SMART-on-FHIR | NTLM | Basic | Kerberos | Certificates</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Conformance.rest.security.service</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam SECURITY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SECURITY);
+
+ /**
+   * Search parameter: <b>name</b>
+   * <p>
+   * Description: <b>Name of the conformance statement</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>Conformance.name</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="name", path="Conformance.name", description="Name of the conformance statement", type="string" )
   public static final String SP_NAME = "name";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>name</b>
+   * <p>
+   * Description: <b>Name of the conformance statement</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>Conformance.name</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.StringClientParam NAME = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_NAME);
+
+ /**
+   * Search parameter: <b>publisher</b>
+   * <p>
+   * Description: <b>Name of the publisher of the conformance statement</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>Conformance.publisher</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="publisher", path="Conformance.publisher", description="Name of the publisher of the conformance statement", type="string" )
   public static final String SP_PUBLISHER = "publisher";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>publisher</b>
+   * <p>
+   * Description: <b>Name of the publisher of the conformance statement</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>Conformance.publisher</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.StringClientParam PUBLISHER = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_PUBLISHER);
+
+ /**
+   * Search parameter: <b>event</b>
+   * <p>
+   * Description: <b>Event code in a conformance statement</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Conformance.messaging.event.code</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="event", path="Conformance.messaging.event.code", description="Event code in a conformance statement", type="token" )
   public static final String SP_EVENT = "event";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>event</b>
+   * <p>
+   * Description: <b>Event code in a conformance statement</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Conformance.messaging.event.code</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam EVENT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_EVENT);
+
+ /**
+   * Search parameter: <b>status</b>
+   * <p>
+   * Description: <b>The current status of the conformance statement</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Conformance.status</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="status", path="Conformance.status", description="The current status of the conformance statement", type="token" )
   public static final String SP_STATUS = "status";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>status</b>
+   * <p>
+   * Description: <b>The current status of the conformance statement</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Conformance.status</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS);
+
 
 }
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Constants.java

@@ -29,12 +29,12 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 
 public class Constants {
 
   public final static String VERSION = "1.2.0";
   public final static String REVISION = "7464";
-  public final static String DATE = "Sun Dec 20 20:55:40 EST 2015";
+  public final static String DATE = "Mon Dec 21 19:58:53 EST 2015";
 }

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ContactPoint.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Contract.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -3947,34 +3947,124 @@ public class Contract extends DomainResource {
     return ResourceType.Contract;
    }
 
+ /**
+   * Search parameter: <b>actor</b>
+   * <p>
+   * Description: <b>Contract Actor Type</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Contract.actor.entity</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="actor", path="Contract.actor.entity", description="Contract Actor Type", type="reference" )
   public static final String SP_ACTOR = "actor";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>actor</b>
+   * <p>
+   * Description: <b>Contract Actor Type</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Contract.actor.entity</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ACTOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ACTOR);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Contract:actor</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_ACTOR = new ca.uhn.fhir.model.api.Include("Contract:actor").toLocked();
 
+ /**
+   * Search parameter: <b>identifier</b>
+   * <p>
+   * Description: <b>The identity of the contract</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Contract.identifier</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="identifier", path="Contract.identifier", description="The identity of the contract", type="token" )
   public static final String SP_IDENTIFIER = "identifier";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>identifier</b>
+   * <p>
+   * Description: <b>The identity of the contract</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Contract.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
+
+ /**
+   * Search parameter: <b>subject</b>
+   * <p>
+   * Description: <b>The identity of the target of the contract</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Contract.subject</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="subject", path="Contract.subject", description="The identity of the target of the contract", type="reference" )
   public static final String SP_SUBJECT = "subject";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>subject</b>
+   * <p>
+   * Description: <b>The identity of the target of the contract</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Contract.subject</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Contract:subject</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("Contract:subject").toLocked();
 
+ /**
+   * Search parameter: <b>patient</b>
+   * <p>
+   * Description: <b>The identity of the target of the contract (if a patient)</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Contract.subject</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="patient", path="Contract.subject", description="The identity of the target of the contract (if a patient)", type="reference" )
   public static final String SP_PATIENT = "patient";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>patient</b>
+   * <p>
+   * Description: <b>The identity of the target of the contract (if a patient)</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Contract.subject</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Contract:patient</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Contract:patient").toLocked();
 
+ /**
+   * Search parameter: <b>signer</b>
+   * <p>
+   * Description: <b>Contract Signatory Party</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Contract.signer.party</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="signer", path="Contract.signer.party", description="Contract Signatory Party", type="reference" )
   public static final String SP_SIGNER = "signer";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>signer</b>
+   * <p>
+   * Description: <b>Contract Signatory Party</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Contract.signer.party</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SIGNER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SIGNER);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Contract:signer</b>".

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Count.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import ca.uhn.fhir.model.api.annotation.DatatypeDef;
 import ca.uhn.fhir.model.api.annotation.Block;

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Coverage.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -898,36 +898,198 @@ public class Coverage extends DomainResource {
     return ResourceType.Coverage;
    }
 
+ /**
+   * Search parameter: <b>identifier</b>
+   * <p>
+   * Description: <b>The primary identifier of the insured</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Coverage.identifier</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="identifier", path="Coverage.identifier", description="The primary identifier of the insured", type="token" )
   public static final String SP_IDENTIFIER = "identifier";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>identifier</b>
+   * <p>
+   * Description: <b>The primary identifier of the insured</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Coverage.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
+
+ /**
+   * Search parameter: <b>sequence</b>
+   * <p>
+   * Description: <b>Sequence number</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Coverage.sequence</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="sequence", path="Coverage.sequence", description="Sequence number", type="token" )
   public static final String SP_SEQUENCE = "sequence";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>sequence</b>
+   * <p>
+   * Description: <b>Sequence number</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Coverage.sequence</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam SEQUENCE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SEQUENCE);
+
+ /**
+   * Search parameter: <b>subscriber</b>
+   * <p>
+   * Description: <b>Reference to the subscriber</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Coverage.subscriber</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="subscriber", path="Coverage.subscriber", description="Reference to the subscriber", type="reference" )
   public static final String SP_SUBSCRIBER = "subscriber";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>subscriber</b>
+   * <p>
+   * Description: <b>Reference to the subscriber</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Coverage.subscriber</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBSCRIBER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBSCRIBER);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Coverage:subscriber</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBSCRIBER = new ca.uhn.fhir.model.api.Include("Coverage:subscriber").toLocked();
 
+ /**
+   * Search parameter: <b>subplan</b>
+   * <p>
+   * Description: <b>Sub-plan identifier</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Coverage.subPlan</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="subplan", path="Coverage.subPlan", description="Sub-plan identifier", type="token" )
   public static final String SP_SUBPLAN = "subplan";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>subplan</b>
+   * <p>
+   * Description: <b>Sub-plan identifier</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Coverage.subPlan</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam SUBPLAN = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SUBPLAN);
+
+ /**
+   * Search parameter: <b>type</b>
+   * <p>
+   * Description: <b>The kind of coverage</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Coverage.type</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="type", path="Coverage.type", description="The kind of coverage", type="token" )
   public static final String SP_TYPE = "type";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>type</b>
+   * <p>
+   * Description: <b>The kind of coverage</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Coverage.type</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE);
+
+ /**
+   * Search parameter: <b>plan</b>
+   * <p>
+   * Description: <b>A plan or policy identifier</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Coverage.plan</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="plan", path="Coverage.plan", description="A plan or policy identifier", type="token" )
   public static final String SP_PLAN = "plan";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>plan</b>
+   * <p>
+   * Description: <b>A plan or policy identifier</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Coverage.plan</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam PLAN = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_PLAN);
+
+ /**
+   * Search parameter: <b>dependent</b>
+   * <p>
+   * Description: <b>Dependent number</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Coverage.dependent</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="dependent", path="Coverage.dependent", description="Dependent number", type="token" )
   public static final String SP_DEPENDENT = "dependent";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>dependent</b>
+   * <p>
+   * Description: <b>Dependent number</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Coverage.dependent</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam DEPENDENT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_DEPENDENT);
+
+ /**
+   * Search parameter: <b>issuer</b>
+   * <p>
+   * Description: <b>The identity of the insurer</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Coverage.issuer</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="issuer", path="Coverage.issuer", description="The identity of the insurer", type="reference" )
   public static final String SP_ISSUER = "issuer";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>issuer</b>
+   * <p>
+   * Description: <b>The identity of the insurer</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Coverage.issuer</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ISSUER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ISSUER);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Coverage:issuer</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_ISSUER = new ca.uhn.fhir.model.api.Include("Coverage:issuer").toLocked();
 
+ /**
+   * Search parameter: <b>group</b>
+   * <p>
+   * Description: <b>Group identifier</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Coverage.group</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="group", path="Coverage.group", description="Group identifier", type="token" )
   public static final String SP_GROUP = "group";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>group</b>
+   * <p>
+   * Description: <b>Group identifier</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Coverage.group</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam GROUP = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_GROUP);
+
 
 }
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DataElement.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -1646,28 +1646,226 @@ public class DataElement extends DomainResource {
     return ResourceType.DataElement;
    }
 
+ /**
+   * Search parameter: <b>date</b>
+   * <p>
+   * Description: <b>The data element publication date</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>DataElement.date</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="date", path="DataElement.date", description="The data element publication date", type="date" )
   public static final String SP_DATE = "date";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>date</b>
+   * <p>
+   * Description: <b>The data element publication date</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>DataElement.date</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE);
+
+ /**
+   * Search parameter: <b>identifier</b>
+   * <p>
+   * Description: <b>The identifier of the data element</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DataElement.identifier</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="identifier", path="DataElement.identifier", description="The identifier of the data element", type="token" )
   public static final String SP_IDENTIFIER = "identifier";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>identifier</b>
+   * <p>
+   * Description: <b>The identifier of the data element</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DataElement.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
+
+ /**
+   * Search parameter: <b>code</b>
+   * <p>
+   * Description: <b>A code for the data element (server may choose to do subsumption)</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DataElement.element.code</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="code", path="DataElement.element.code", description="A code for the data element (server may choose to do subsumption)", type="token" )
   public static final String SP_CODE = "code";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>code</b>
+   * <p>
+   * Description: <b>A code for the data element (server may choose to do subsumption)</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DataElement.element.code</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CODE);
+
+ /**
+   * Search parameter: <b>stringency</b>
+   * <p>
+   * Description: <b>The stringency of the data element definition</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DataElement.stringency</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="stringency", path="DataElement.stringency", description="The stringency of the data element definition", type="token" )
   public static final String SP_STRINGENCY = "stringency";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>stringency</b>
+   * <p>
+   * Description: <b>The stringency of the data element definition</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DataElement.stringency</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam STRINGENCY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STRINGENCY);
+
+ /**
+   * Search parameter: <b>name</b>
+   * <p>
+   * Description: <b>Name of the data element</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>DataElement.name</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="name", path="DataElement.name", description="Name of the data element", type="string" )
   public static final String SP_NAME = "name";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>name</b>
+   * <p>
+   * Description: <b>Name of the data element</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>DataElement.name</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.StringClientParam NAME = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_NAME);
+
+ /**
+   * Search parameter: <b>context</b>
+   * <p>
+   * Description: <b>A use context assigned to the data element</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DataElement.useContext</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="context", path="DataElement.useContext", description="A use context assigned to the data element", type="token" )
   public static final String SP_CONTEXT = "context";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>context</b>
+   * <p>
+   * Description: <b>A use context assigned to the data element</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DataElement.useContext</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam CONTEXT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CONTEXT);
+
+ /**
+   * Search parameter: <b>publisher</b>
+   * <p>
+   * Description: <b>Name of the publisher of the data element</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>DataElement.publisher</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="publisher", path="DataElement.publisher", description="Name of the publisher of the data element", type="string" )
   public static final String SP_PUBLISHER = "publisher";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>publisher</b>
+   * <p>
+   * Description: <b>Name of the publisher of the data element</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>DataElement.publisher</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.StringClientParam PUBLISHER = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_PUBLISHER);
+
+ /**
+   * Search parameter: <b>description</b>
+   * <p>
+   * Description: <b>Text search in the description of the data element.  This corresponds to the definition of the first DataElement.element.</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>DataElement.element.definition</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="description", path="DataElement.element.definition", description="Text search in the description of the data element.  This corresponds to the definition of the first DataElement.element.", type="string" )
   public static final String SP_DESCRIPTION = "description";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>description</b>
+   * <p>
+   * Description: <b>Text search in the description of the data element.  This corresponds to the definition of the first DataElement.element.</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>DataElement.element.definition</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.StringClientParam DESCRIPTION = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_DESCRIPTION);
+
+ /**
+   * Search parameter: <b>version</b>
+   * <p>
+   * Description: <b>The version identifier of the data element</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>DataElement.version</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="version", path="DataElement.version", description="The version identifier of the data element", type="string" )
   public static final String SP_VERSION = "version";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>version</b>
+   * <p>
+   * Description: <b>The version identifier of the data element</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>DataElement.version</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.StringClientParam VERSION = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_VERSION);
+
+ /**
+   * Search parameter: <b>url</b>
+   * <p>
+   * Description: <b>The official URL for the data element</b><br>
+   * Type: <b>uri</b><br>
+   * Path: <b>DataElement.url</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="url", path="DataElement.url", description="The official URL for the data element", type="uri" )
   public static final String SP_URL = "url";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>url</b>
+   * <p>
+   * Description: <b>The official URL for the data element</b><br>
+   * Type: <b>uri</b><br>
+   * Path: <b>DataElement.url</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.UriClientParam URL = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_URL);
+
+ /**
+   * Search parameter: <b>status</b>
+   * <p>
+   * Description: <b>The current status of the data element</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DataElement.status</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="status", path="DataElement.status", description="The current status of the data element", type="token" )
   public static final String SP_STATUS = "status";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>status</b>
+   * <p>
+   * Description: <b>The current status of the data element</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DataElement.status</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS);
+
 
 }
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DecisionSupportRule.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DecisionSupportServiceModule.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DetectedIssue.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -1050,36 +1050,144 @@ public class DetectedIssue extends DomainResource {
     return ResourceType.DetectedIssue;
    }
 
+ /**
+   * Search parameter: <b>date</b>
+   * <p>
+   * Description: <b>When identified</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>DetectedIssue.date</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="date", path="DetectedIssue.date", description="When identified", type="date" )
   public static final String SP_DATE = "date";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>date</b>
+   * <p>
+   * Description: <b>When identified</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>DetectedIssue.date</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE);
+
+ /**
+   * Search parameter: <b>identifier</b>
+   * <p>
+   * Description: <b>Unique id for the detected issue</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DetectedIssue.identifier</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="identifier", path="DetectedIssue.identifier", description="Unique id for the detected issue", type="token" )
   public static final String SP_IDENTIFIER = "identifier";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>identifier</b>
+   * <p>
+   * Description: <b>Unique id for the detected issue</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DetectedIssue.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
+
+ /**
+   * Search parameter: <b>patient</b>
+   * <p>
+   * Description: <b>Associated patient</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DetectedIssue.patient</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="patient", path="DetectedIssue.patient", description="Associated patient", type="reference" )
   public static final String SP_PATIENT = "patient";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>patient</b>
+   * <p>
+   * Description: <b>Associated patient</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DetectedIssue.patient</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DetectedIssue:patient</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("DetectedIssue:patient").toLocked();
 
+ /**
+   * Search parameter: <b>author</b>
+   * <p>
+   * Description: <b>The provider or device that identified the issue</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DetectedIssue.author</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="author", path="DetectedIssue.author", description="The provider or device that identified the issue", type="reference" )
   public static final String SP_AUTHOR = "author";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>author</b>
+   * <p>
+   * Description: <b>The provider or device that identified the issue</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DetectedIssue.author</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam AUTHOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_AUTHOR);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DetectedIssue:author</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_AUTHOR = new ca.uhn.fhir.model.api.Include("DetectedIssue:author").toLocked();
 
+ /**
+   * Search parameter: <b>implicated</b>
+   * <p>
+   * Description: <b>Problem resource</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DetectedIssue.implicated</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="implicated", path="DetectedIssue.implicated", description="Problem resource", type="reference" )
   public static final String SP_IMPLICATED = "implicated";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>implicated</b>
+   * <p>
+   * Description: <b>Problem resource</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DetectedIssue.implicated</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam IMPLICATED = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_IMPLICATED);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DetectedIssue:implicated</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_IMPLICATED = new ca.uhn.fhir.model.api.Include("DetectedIssue:implicated").toLocked();
 
+ /**
+   * Search parameter: <b>category</b>
+   * <p>
+   * Description: <b>Issue Category, e.g. drug-drug, duplicate therapy, etc.</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DetectedIssue.category</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="category", path="DetectedIssue.category", description="Issue Category, e.g. drug-drug, duplicate therapy, etc.", type="token" )
   public static final String SP_CATEGORY = "category";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>category</b>
+   * <p>
+   * Description: <b>Issue Category, e.g. drug-drug, duplicate therapy, etc.</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DetectedIssue.category</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam CATEGORY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CATEGORY);
+
 
 }
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Device.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -1212,42 +1212,204 @@ public class Device extends DomainResource {
     return ResourceType.Device;
    }
 
+ /**
+   * Search parameter: <b>identifier</b>
+   * <p>
+   * Description: <b>Instance id from manufacturer, owner, and others</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Device.identifier</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="identifier", path="Device.identifier", description="Instance id from manufacturer, owner, and others", type="token" )
   public static final String SP_IDENTIFIER = "identifier";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>identifier</b>
+   * <p>
+   * Description: <b>Instance id from manufacturer, owner, and others</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Device.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
+
+ /**
+   * Search parameter: <b>patient</b>
+   * <p>
+   * Description: <b>Patient information, if the resource is affixed to a person</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Device.patient</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="patient", path="Device.patient", description="Patient information, if the resource is affixed to a person", type="reference" )
   public static final String SP_PATIENT = "patient";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>patient</b>
+   * <p>
+   * Description: <b>Patient information, if the resource is affixed to a person</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Device.patient</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Device:patient</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Device:patient").toLocked();
 
+ /**
+   * Search parameter: <b>organization</b>
+   * <p>
+   * Description: <b>The organization responsible for the device</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Device.owner</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="organization", path="Device.owner", description="The organization responsible for the device", type="reference" )
   public static final String SP_ORGANIZATION = "organization";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>organization</b>
+   * <p>
+   * Description: <b>The organization responsible for the device</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Device.owner</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ORGANIZATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ORGANIZATION);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Device:organization</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_ORGANIZATION = new ca.uhn.fhir.model.api.Include("Device:organization").toLocked();
 
+ /**
+   * Search parameter: <b>model</b>
+   * <p>
+   * Description: <b>The model of the device</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>Device.model</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="model", path="Device.model", description="The model of the device", type="string" )
   public static final String SP_MODEL = "model";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>model</b>
+   * <p>
+   * Description: <b>The model of the device</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>Device.model</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.StringClientParam MODEL = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_MODEL);
+
+ /**
+   * Search parameter: <b>location</b>
+   * <p>
+   * Description: <b>A location, where the resource is found</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Device.location</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="location", path="Device.location", description="A location, where the resource is found", type="reference" )
   public static final String SP_LOCATION = "location";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>location</b>
+   * <p>
+   * Description: <b>A location, where the resource is found</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Device.location</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam LOCATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_LOCATION);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Device:location</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_LOCATION = new ca.uhn.fhir.model.api.Include("Device:location").toLocked();
 
+ /**
+   * Search parameter: <b>udi</b>
+   * <p>
+   * Description: <b>FDA mandated Unique Device Identifier</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>Device.udi</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="udi", path="Device.udi", description="FDA mandated Unique Device Identifier", type="string" )
   public static final String SP_UDI = "udi";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>udi</b>
+   * <p>
+   * Description: <b>FDA mandated Unique Device Identifier</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>Device.udi</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.StringClientParam UDI = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_UDI);
+
+ /**
+   * Search parameter: <b>type</b>
+   * <p>
+   * Description: <b>The type of the device</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Device.type</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="type", path="Device.type", description="The type of the device", type="token" )
   public static final String SP_TYPE = "type";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>type</b>
+   * <p>
+   * Description: <b>The type of the device</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Device.type</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE);
+
+ /**
+   * Search parameter: <b>url</b>
+   * <p>
+   * Description: <b>Network address to contact device</b><br>
+   * Type: <b>uri</b><br>
+   * Path: <b>Device.url</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="url", path="Device.url", description="Network address to contact device", type="uri" )
   public static final String SP_URL = "url";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>url</b>
+   * <p>
+   * Description: <b>Network address to contact device</b><br>
+   * Type: <b>uri</b><br>
+   * Path: <b>Device.url</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.UriClientParam URL = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_URL);
+
+ /**
+   * Search parameter: <b>manufacturer</b>
+   * <p>
+   * Description: <b>The manufacturer of the device</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>Device.manufacturer</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="manufacturer", path="Device.manufacturer", description="The manufacturer of the device", type="string" )
   public static final String SP_MANUFACTURER = "manufacturer";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>manufacturer</b>
+   * <p>
+   * Description: <b>The manufacturer of the device</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>Device.manufacturer</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.StringClientParam MANUFACTURER = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_MANUFACTURER);
+
 
 }
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceComponent.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -1097,24 +1097,78 @@ public class DeviceComponent extends DomainResource {
     return ResourceType.DeviceComponent;
    }
 
+ /**
+   * Search parameter: <b>parent</b>
+   * <p>
+   * Description: <b>The parent DeviceComponent resource</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DeviceComponent.parent</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="parent", path="DeviceComponent.parent", description="The parent DeviceComponent resource", type="reference" )
   public static final String SP_PARENT = "parent";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>parent</b>
+   * <p>
+   * Description: <b>The parent DeviceComponent resource</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DeviceComponent.parent</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PARENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PARENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DeviceComponent:parent</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PARENT = new ca.uhn.fhir.model.api.Include("DeviceComponent:parent").toLocked();
 
+ /**
+   * Search parameter: <b>source</b>
+   * <p>
+   * Description: <b>The device source</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DeviceComponent.source</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="source", path="DeviceComponent.source", description="The device source", type="reference" )
   public static final String SP_SOURCE = "source";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>source</b>
+   * <p>
+   * Description: <b>The device source</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DeviceComponent.source</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SOURCE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SOURCE);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DeviceComponent:source</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_SOURCE = new ca.uhn.fhir.model.api.Include("DeviceComponent:source").toLocked();
 
+ /**
+   * Search parameter: <b>type</b>
+   * <p>
+   * Description: <b>The device component type</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DeviceComponent.type</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="type", path="DeviceComponent.type", description="The device component type", type="token" )
   public static final String SP_TYPE = "type";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>type</b>
+   * <p>
+   * Description: <b>The device component type</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DeviceComponent.type</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE);
+
 
 }
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceMetric.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -1560,28 +1560,118 @@ public class DeviceMetric extends DomainResource {
     return ResourceType.DeviceMetric;
    }
 
+ /**
+   * Search parameter: <b>parent</b>
+   * <p>
+   * Description: <b>The parent DeviceMetric resource</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DeviceMetric.parent</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="parent", path="DeviceMetric.parent", description="The parent DeviceMetric resource", type="reference" )
   public static final String SP_PARENT = "parent";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>parent</b>
+   * <p>
+   * Description: <b>The parent DeviceMetric resource</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DeviceMetric.parent</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PARENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PARENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DeviceMetric:parent</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PARENT = new ca.uhn.fhir.model.api.Include("DeviceMetric:parent").toLocked();
 
+ /**
+   * Search parameter: <b>identifier</b>
+   * <p>
+   * Description: <b>The identifier of the metric</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DeviceMetric.identifier</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="identifier", path="DeviceMetric.identifier", description="The identifier of the metric", type="token" )
   public static final String SP_IDENTIFIER = "identifier";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>identifier</b>
+   * <p>
+   * Description: <b>The identifier of the metric</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DeviceMetric.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
+
+ /**
+   * Search parameter: <b>source</b>
+   * <p>
+   * Description: <b>The device resource</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DeviceMetric.source</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="source", path="DeviceMetric.source", description="The device resource", type="reference" )
   public static final String SP_SOURCE = "source";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>source</b>
+   * <p>
+   * Description: <b>The device resource</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DeviceMetric.source</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SOURCE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SOURCE);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DeviceMetric:source</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_SOURCE = new ca.uhn.fhir.model.api.Include("DeviceMetric:source").toLocked();
 
+ /**
+   * Search parameter: <b>type</b>
+   * <p>
+   * Description: <b>The component type</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DeviceMetric.type</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="type", path="DeviceMetric.type", description="The component type", type="token" )
   public static final String SP_TYPE = "type";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>type</b>
+   * <p>
+   * Description: <b>The component type</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DeviceMetric.type</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE);
+
+ /**
+   * Search parameter: <b>category</b>
+   * <p>
+   * Description: <b>The category of the metric</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DeviceMetric.category</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="category", path="DeviceMetric.category", description="The category of the metric", type="token" )
   public static final String SP_CATEGORY = "category";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>category</b>
+   * <p>
+   * Description: <b>The category of the metric</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DeviceMetric.category</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam CATEGORY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CATEGORY);
+
 
 }
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceUseRequest.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -1304,24 +1304,78 @@ public class DeviceUseRequest extends DomainResource {
     return ResourceType.DeviceUseRequest;
    }
 
+ /**
+   * Search parameter: <b>subject</b>
+   * <p>
+   * Description: <b>Search by subject</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DeviceUseRequest.subject</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="subject", path="DeviceUseRequest.subject", description="Search by subject", type="reference" )
   public static final String SP_SUBJECT = "subject";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>subject</b>
+   * <p>
+   * Description: <b>Search by subject</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DeviceUseRequest.subject</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DeviceUseRequest:subject</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("DeviceUseRequest:subject").toLocked();
 
+ /**
+   * Search parameter: <b>patient</b>
+   * <p>
+   * Description: <b>Search by subject - a patient</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DeviceUseRequest.subject</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="patient", path="DeviceUseRequest.subject", description="Search by subject - a patient", type="reference" )
   public static final String SP_PATIENT = "patient";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>patient</b>
+   * <p>
+   * Description: <b>Search by subject - a patient</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DeviceUseRequest.subject</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DeviceUseRequest:patient</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("DeviceUseRequest:patient").toLocked();
 
+ /**
+   * Search parameter: <b>device</b>
+   * <p>
+   * Description: <b>Device requested</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DeviceUseRequest.device</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="device", path="DeviceUseRequest.device", description="Device requested", type="reference" )
   public static final String SP_DEVICE = "device";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>device</b>
+   * <p>
+   * Description: <b>Device requested</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DeviceUseRequest.device</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam DEVICE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_DEVICE);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DeviceUseRequest:device</b>".

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DeviceUseStatement.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -694,24 +694,78 @@ public class DeviceUseStatement extends DomainResource {
     return ResourceType.DeviceUseStatement;
    }
 
+ /**
+   * Search parameter: <b>subject</b>
+   * <p>
+   * Description: <b>Search by subject</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DeviceUseStatement.subject</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="subject", path="DeviceUseStatement.subject", description="Search by subject", type="reference" )
   public static final String SP_SUBJECT = "subject";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>subject</b>
+   * <p>
+   * Description: <b>Search by subject</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DeviceUseStatement.subject</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DeviceUseStatement:subject</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("DeviceUseStatement:subject").toLocked();
 
+ /**
+   * Search parameter: <b>patient</b>
+   * <p>
+   * Description: <b>Search by subject - a patient</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DeviceUseStatement.subject</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="patient", path="DeviceUseStatement.subject", description="Search by subject - a patient", type="reference" )
   public static final String SP_PATIENT = "patient";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>patient</b>
+   * <p>
+   * Description: <b>Search by subject - a patient</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DeviceUseStatement.subject</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DeviceUseStatement:patient</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("DeviceUseStatement:patient").toLocked();
 
+ /**
+   * Search parameter: <b>device</b>
+   * <p>
+   * Description: <b>Search by device</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DeviceUseStatement.device</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="device", path="DeviceUseStatement.device", description="Search by device", type="reference" )
   public static final String SP_DEVICE = "device";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>device</b>
+   * <p>
+   * Description: <b>Search by device</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DeviceUseStatement.device</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam DEVICE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_DEVICE);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DeviceUseStatement:device</b>".

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DiagnosticOrder.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -1923,76 +1923,382 @@ public class DiagnosticOrder extends DomainResource {
     return ResourceType.DiagnosticOrder;
    }
 
+ /**
+   * Search parameter: <b>item-past-status</b>
+   * <p>
+   * Description: <b>proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DiagnosticOrder.item.event.status</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="item-past-status", path="DiagnosticOrder.item.event.status", description="proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed", type="token" )
   public static final String SP_ITEM_PAST_STATUS = "item-past-status";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>item-past-status</b>
+   * <p>
+   * Description: <b>proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DiagnosticOrder.item.event.status</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam ITEM_PAST_STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ITEM_PAST_STATUS);
+
+ /**
+   * Search parameter: <b>identifier</b>
+   * <p>
+   * Description: <b>Identifiers assigned to this order</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DiagnosticOrder.identifier</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="identifier", path="DiagnosticOrder.identifier", description="Identifiers assigned to this order", type="token" )
   public static final String SP_IDENTIFIER = "identifier";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>identifier</b>
+   * <p>
+   * Description: <b>Identifiers assigned to this order</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DiagnosticOrder.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
+
+ /**
+   * Search parameter: <b>bodysite</b>
+   * <p>
+   * Description: <b>Location of requested test (if applicable)</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DiagnosticOrder.item.bodySite</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="bodysite", path="DiagnosticOrder.item.bodySite", description="Location of requested test (if applicable)", type="token" )
   public static final String SP_BODYSITE = "bodysite";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>bodysite</b>
+   * <p>
+   * Description: <b>Location of requested test (if applicable)</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DiagnosticOrder.item.bodySite</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam BODYSITE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_BODYSITE);
+
+ /**
+   * Search parameter: <b>code</b>
+   * <p>
+   * Description: <b>Code to indicate the item (test or panel) being ordered</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DiagnosticOrder.item.code</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="code", path="DiagnosticOrder.item.code", description="Code to indicate the item (test or panel) being ordered", type="token" )
   public static final String SP_CODE = "code";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>code</b>
+   * <p>
+   * Description: <b>Code to indicate the item (test or panel) being ordered</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DiagnosticOrder.item.code</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CODE);
+
+ /**
+   * Search parameter: <b>event-date</b>
+   * <p>
+   * Description: <b>The date at which the event happened</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>DiagnosticOrder.event.dateTime</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="event-date", path="DiagnosticOrder.event.dateTime", description="The date at which the event happened", type="date" )
   public static final String SP_EVENT_DATE = "event-date";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>event-date</b>
+   * <p>
+   * Description: <b>The date at which the event happened</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>DiagnosticOrder.event.dateTime</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam EVENT_DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_EVENT_DATE);
+
+ /**
+   * Search parameter: <b>event-status-date</b>
+   * <p>
+   * Description: <b>A combination of past-status and date</b><br>
+   * Type: <b>composite</b><br>
+   * Path: <b></b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="event-status-date", path="", description="A combination of past-status and date", type="composite" )
   public static final String SP_EVENT_STATUS_DATE = "event-status-date";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>event-status-date</b>
+   * <p>
+   * Description: <b>A combination of past-status and date</b><br>
+   * Type: <b>composite</b><br>
+   * Path: <b></b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.CompositeClientParam EVENT_STATUS_DATE = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_EVENT_STATUS_DATE);
+
+ /**
+   * Search parameter: <b>subject</b>
+   * <p>
+   * Description: <b>Who and/or what test is about</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DiagnosticOrder.subject</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="subject", path="DiagnosticOrder.subject", description="Who and/or what test is about", type="reference" )
   public static final String SP_SUBJECT = "subject";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>subject</b>
+   * <p>
+   * Description: <b>Who and/or what test is about</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DiagnosticOrder.subject</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DiagnosticOrder:subject</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("DiagnosticOrder:subject").toLocked();
 
+ /**
+   * Search parameter: <b>encounter</b>
+   * <p>
+   * Description: <b>The encounter that this diagnostic order is associated with</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DiagnosticOrder.encounter</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="encounter", path="DiagnosticOrder.encounter", description="The encounter that this diagnostic order is associated with", type="reference" )
   public static final String SP_ENCOUNTER = "encounter";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>encounter</b>
+   * <p>
+   * Description: <b>The encounter that this diagnostic order is associated with</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DiagnosticOrder.encounter</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENCOUNTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENCOUNTER);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DiagnosticOrder:encounter</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_ENCOUNTER = new ca.uhn.fhir.model.api.Include("DiagnosticOrder:encounter").toLocked();
 
+ /**
+   * Search parameter: <b>actor</b>
+   * <p>
+   * Description: <b>Who recorded or did this</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DiagnosticOrder.event.actor, DiagnosticOrder.item.event.actor</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="actor", path="DiagnosticOrder.event.actor|DiagnosticOrder.item.event.actor", description="Who recorded or did this", type="reference" )
   public static final String SP_ACTOR = "actor";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>actor</b>
+   * <p>
+   * Description: <b>Who recorded or did this</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DiagnosticOrder.event.actor, DiagnosticOrder.item.event.actor</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ACTOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ACTOR);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DiagnosticOrder:actor</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_ACTOR = new ca.uhn.fhir.model.api.Include("DiagnosticOrder:actor").toLocked();
 
+ /**
+   * Search parameter: <b>item-date</b>
+   * <p>
+   * Description: <b>The date at which the event happened</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>DiagnosticOrder.item.event.dateTime</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="item-date", path="DiagnosticOrder.item.event.dateTime", description="The date at which the event happened", type="date" )
   public static final String SP_ITEM_DATE = "item-date";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>item-date</b>
+   * <p>
+   * Description: <b>The date at which the event happened</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>DiagnosticOrder.item.event.dateTime</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam ITEM_DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_ITEM_DATE);
+
+ /**
+   * Search parameter: <b>item-status-date</b>
+   * <p>
+   * Description: <b>A combination of item-past-status and item-date</b><br>
+   * Type: <b>composite</b><br>
+   * Path: <b></b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="item-status-date", path="", description="A combination of item-past-status and item-date", type="composite" )
   public static final String SP_ITEM_STATUS_DATE = "item-status-date";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>item-status-date</b>
+   * <p>
+   * Description: <b>A combination of item-past-status and item-date</b><br>
+   * Type: <b>composite</b><br>
+   * Path: <b></b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.CompositeClientParam ITEM_STATUS_DATE = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_ITEM_STATUS_DATE);
+
+ /**
+   * Search parameter: <b>event-status</b>
+   * <p>
+   * Description: <b>proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DiagnosticOrder.event.status</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="event-status", path="DiagnosticOrder.event.status", description="proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed", type="token" )
   public static final String SP_EVENT_STATUS = "event-status";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>event-status</b>
+   * <p>
+   * Description: <b>proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DiagnosticOrder.event.status</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam EVENT_STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_EVENT_STATUS);
+
+ /**
+   * Search parameter: <b>item-status</b>
+   * <p>
+   * Description: <b>proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DiagnosticOrder.item.status</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="item-status", path="DiagnosticOrder.item.status", description="proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed", type="token" )
   public static final String SP_ITEM_STATUS = "item-status";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>item-status</b>
+   * <p>
+   * Description: <b>proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DiagnosticOrder.item.status</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam ITEM_STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_ITEM_STATUS);
+
+ /**
+   * Search parameter: <b>patient</b>
+   * <p>
+   * Description: <b>Who and/or what test is about</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DiagnosticOrder.subject</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="patient", path="DiagnosticOrder.subject", description="Who and/or what test is about", type="reference" )
   public static final String SP_PATIENT = "patient";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>patient</b>
+   * <p>
+   * Description: <b>Who and/or what test is about</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DiagnosticOrder.subject</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DiagnosticOrder:patient</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("DiagnosticOrder:patient").toLocked();
 
+ /**
+   * Search parameter: <b>orderer</b>
+   * <p>
+   * Description: <b>Who ordered the test</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DiagnosticOrder.orderer</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="orderer", path="DiagnosticOrder.orderer", description="Who ordered the test", type="reference" )
   public static final String SP_ORDERER = "orderer";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>orderer</b>
+   * <p>
+   * Description: <b>Who ordered the test</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DiagnosticOrder.orderer</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ORDERER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ORDERER);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DiagnosticOrder:orderer</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_ORDERER = new ca.uhn.fhir.model.api.Include("DiagnosticOrder:orderer").toLocked();
 
+ /**
+   * Search parameter: <b>specimen</b>
+   * <p>
+   * Description: <b>If the whole order relates to specific specimens</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DiagnosticOrder.specimen, DiagnosticOrder.item.specimen</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="specimen", path="DiagnosticOrder.specimen|DiagnosticOrder.item.specimen", description="If the whole order relates to specific specimens", type="reference" )
   public static final String SP_SPECIMEN = "specimen";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>specimen</b>
+   * <p>
+   * Description: <b>If the whole order relates to specific specimens</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DiagnosticOrder.specimen, DiagnosticOrder.item.specimen</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SPECIMEN = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SPECIMEN);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DiagnosticOrder:specimen</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_SPECIMEN = new ca.uhn.fhir.model.api.Include("DiagnosticOrder:specimen").toLocked();
 
+ /**
+   * Search parameter: <b>status</b>
+   * <p>
+   * Description: <b>proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DiagnosticOrder.status</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="status", path="DiagnosticOrder.status", description="proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed", type="token" )
   public static final String SP_STATUS = "status";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>status</b>
+   * <p>
+   * Description: <b>proposed | draft | planned | requested | received | accepted | in-progress | review | completed | cancelled | suspended | rejected | failed</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DiagnosticOrder.status</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS);
+
 
 }
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DiagnosticReport.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -1558,84 +1558,354 @@ public class DiagnosticReport extends DomainResource {
     return ResourceType.DiagnosticReport;
    }
 
+ /**
+   * Search parameter: <b>date</b>
+   * <p>
+   * Description: <b>The clinically relevant time of the report</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>DiagnosticReport.effective[x]</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="date", path="DiagnosticReport.effective[x]", description="The clinically relevant time of the report", type="date" )
   public static final String SP_DATE = "date";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>date</b>
+   * <p>
+   * Description: <b>The clinically relevant time of the report</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>DiagnosticReport.effective[x]</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE);
+
+ /**
+   * Search parameter: <b>identifier</b>
+   * <p>
+   * Description: <b>An identifier for the report</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DiagnosticReport.identifier</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="identifier", path="DiagnosticReport.identifier", description="An identifier for the report", type="token" )
   public static final String SP_IDENTIFIER = "identifier";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>identifier</b>
+   * <p>
+   * Description: <b>An identifier for the report</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DiagnosticReport.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
+
+ /**
+   * Search parameter: <b>image</b>
+   * <p>
+   * Description: <b>A reference to the image source.</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DiagnosticReport.image.link</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="image", path="DiagnosticReport.image.link", description="A reference to the image source.", type="reference" )
   public static final String SP_IMAGE = "image";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>image</b>
+   * <p>
+   * Description: <b>A reference to the image source.</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DiagnosticReport.image.link</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam IMAGE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_IMAGE);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DiagnosticReport:image</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_IMAGE = new ca.uhn.fhir.model.api.Include("DiagnosticReport:image").toLocked();
 
+ /**
+   * Search parameter: <b>request</b>
+   * <p>
+   * Description: <b>Reference to the test or procedure request.</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DiagnosticReport.request</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="request", path="DiagnosticReport.request", description="Reference to the test or procedure request.", type="reference" )
   public static final String SP_REQUEST = "request";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>request</b>
+   * <p>
+   * Description: <b>Reference to the test or procedure request.</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DiagnosticReport.request</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REQUEST = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REQUEST);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DiagnosticReport:request</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_REQUEST = new ca.uhn.fhir.model.api.Include("DiagnosticReport:request").toLocked();
 
+ /**
+   * Search parameter: <b>performer</b>
+   * <p>
+   * Description: <b>Who was the source of the report (organization)</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DiagnosticReport.performer</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="performer", path="DiagnosticReport.performer", description="Who was the source of the report (organization)", type="reference" )
   public static final String SP_PERFORMER = "performer";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>performer</b>
+   * <p>
+   * Description: <b>Who was the source of the report (organization)</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DiagnosticReport.performer</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PERFORMER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PERFORMER);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DiagnosticReport:performer</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PERFORMER = new ca.uhn.fhir.model.api.Include("DiagnosticReport:performer").toLocked();
 
+ /**
+   * Search parameter: <b>code</b>
+   * <p>
+   * Description: <b>The code for the report as a whole, as opposed to codes for the atomic results, which are the names on the observation resource referred to from the result</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DiagnosticReport.code</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="code", path="DiagnosticReport.code", description="The code for the report as a whole, as opposed to codes for the atomic results, which are the names on the observation resource referred to from the result", type="token" )
   public static final String SP_CODE = "code";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>code</b>
+   * <p>
+   * Description: <b>The code for the report as a whole, as opposed to codes for the atomic results, which are the names on the observation resource referred to from the result</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DiagnosticReport.code</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam CODE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CODE);
+
+ /**
+   * Search parameter: <b>subject</b>
+   * <p>
+   * Description: <b>The subject of the report</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DiagnosticReport.subject</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="subject", path="DiagnosticReport.subject", description="The subject of the report", type="reference" )
   public static final String SP_SUBJECT = "subject";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>subject</b>
+   * <p>
+   * Description: <b>The subject of the report</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DiagnosticReport.subject</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DiagnosticReport:subject</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("DiagnosticReport:subject").toLocked();
 
+ /**
+   * Search parameter: <b>diagnosis</b>
+   * <p>
+   * Description: <b>A coded diagnosis on the report</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DiagnosticReport.codedDiagnosis</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="diagnosis", path="DiagnosticReport.codedDiagnosis", description="A coded diagnosis on the report", type="token" )
   public static final String SP_DIAGNOSIS = "diagnosis";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>diagnosis</b>
+   * <p>
+   * Description: <b>A coded diagnosis on the report</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DiagnosticReport.codedDiagnosis</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam DIAGNOSIS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_DIAGNOSIS);
+
+ /**
+   * Search parameter: <b>encounter</b>
+   * <p>
+   * Description: <b>The Encounter when the order was made</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DiagnosticReport.encounter</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="encounter", path="DiagnosticReport.encounter", description="The Encounter when the order was made", type="reference" )
   public static final String SP_ENCOUNTER = "encounter";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>encounter</b>
+   * <p>
+   * Description: <b>The Encounter when the order was made</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DiagnosticReport.encounter</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENCOUNTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENCOUNTER);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DiagnosticReport:encounter</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_ENCOUNTER = new ca.uhn.fhir.model.api.Include("DiagnosticReport:encounter").toLocked();
 
+ /**
+   * Search parameter: <b>result</b>
+   * <p>
+   * Description: <b>Link to an atomic result (observation resource)</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DiagnosticReport.result</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="result", path="DiagnosticReport.result", description="Link to an atomic result (observation resource)", type="reference" )
   public static final String SP_RESULT = "result";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>result</b>
+   * <p>
+   * Description: <b>Link to an atomic result (observation resource)</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DiagnosticReport.result</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RESULT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RESULT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DiagnosticReport:result</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_RESULT = new ca.uhn.fhir.model.api.Include("DiagnosticReport:result").toLocked();
 
+ /**
+   * Search parameter: <b>patient</b>
+   * <p>
+   * Description: <b>The subject of the report if a patient</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DiagnosticReport.subject</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="patient", path="DiagnosticReport.subject", description="The subject of the report if a patient", type="reference" )
   public static final String SP_PATIENT = "patient";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>patient</b>
+   * <p>
+   * Description: <b>The subject of the report if a patient</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DiagnosticReport.subject</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DiagnosticReport:patient</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("DiagnosticReport:patient").toLocked();
 
+ /**
+   * Search parameter: <b>specimen</b>
+   * <p>
+   * Description: <b>The specimen details</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DiagnosticReport.specimen</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="specimen", path="DiagnosticReport.specimen", description="The specimen details", type="reference" )
   public static final String SP_SPECIMEN = "specimen";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>specimen</b>
+   * <p>
+   * Description: <b>The specimen details</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DiagnosticReport.specimen</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SPECIMEN = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SPECIMEN);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DiagnosticReport:specimen</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_SPECIMEN = new ca.uhn.fhir.model.api.Include("DiagnosticReport:specimen").toLocked();
 
+ /**
+   * Search parameter: <b>issued</b>
+   * <p>
+   * Description: <b>When the report was issued</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>DiagnosticReport.issued</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="issued", path="DiagnosticReport.issued", description="When the report was issued", type="date" )
   public static final String SP_ISSUED = "issued";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>issued</b>
+   * <p>
+   * Description: <b>When the report was issued</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>DiagnosticReport.issued</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam ISSUED = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_ISSUED);
+
+ /**
+   * Search parameter: <b>category</b>
+   * <p>
+   * Description: <b>Which diagnostic discipline/department created the report</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DiagnosticReport.category</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="category", path="DiagnosticReport.category", description="Which diagnostic discipline/department created the report", type="token" )
   public static final String SP_CATEGORY = "category";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>category</b>
+   * <p>
+   * Description: <b>Which diagnostic discipline/department created the report</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DiagnosticReport.category</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam CATEGORY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CATEGORY);
+
+ /**
+   * Search parameter: <b>status</b>
+   * <p>
+   * Description: <b>The status of the report</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DiagnosticReport.status</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="status", path="DiagnosticReport.status", description="The status of the report", type="token" )
   public static final String SP_STATUS = "status";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>status</b>
+   * <p>
+   * Description: <b>The status of the report</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DiagnosticReport.status</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS);
+
 
 }
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Distance.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import ca.uhn.fhir.model.api.annotation.DatatypeDef;
 import ca.uhn.fhir.model.api.annotation.Block;

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DocumentManifest.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -1136,68 +1136,302 @@ public class DocumentManifest extends DomainResource {
     return ResourceType.DocumentManifest;
    }
 
+ /**
+   * Search parameter: <b>identifier</b>
+   * <p>
+   * Description: <b>Unique Identifier for the set of documents</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DocumentManifest.masterIdentifier, DocumentManifest.identifier</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="identifier", path="DocumentManifest.masterIdentifier|DocumentManifest.identifier", description="Unique Identifier for the set of documents", type="token" )
   public static final String SP_IDENTIFIER = "identifier";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>identifier</b>
+   * <p>
+   * Description: <b>Unique Identifier for the set of documents</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DocumentManifest.masterIdentifier, DocumentManifest.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
+
+ /**
+   * Search parameter: <b>related-id</b>
+   * <p>
+   * Description: <b>Identifiers of things that are related</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DocumentManifest.related.identifier</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="related-id", path="DocumentManifest.related.identifier", description="Identifiers of things that are related", type="token" )
   public static final String SP_RELATED_ID = "related-id";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>related-id</b>
+   * <p>
+   * Description: <b>Identifiers of things that are related</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DocumentManifest.related.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam RELATED_ID = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_RELATED_ID);
+
+ /**
+   * Search parameter: <b>content-ref</b>
+   * <p>
+   * Description: <b>Contents of this set of documents</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DocumentManifest.content.pReference</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="content-ref", path="DocumentManifest.content.pReference", description="Contents of this set of documents", type="reference" )
   public static final String SP_CONTENT_REF = "content-ref";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>content-ref</b>
+   * <p>
+   * Description: <b>Contents of this set of documents</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DocumentManifest.content.pReference</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam CONTENT_REF = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_CONTENT_REF);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DocumentManifest:content-ref</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_CONTENT_REF = new ca.uhn.fhir.model.api.Include("DocumentManifest:content-ref").toLocked();
 
+ /**
+   * Search parameter: <b>subject</b>
+   * <p>
+   * Description: <b>The subject of the set of documents</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DocumentManifest.subject</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="subject", path="DocumentManifest.subject", description="The subject of the set of documents", type="reference" )
   public static final String SP_SUBJECT = "subject";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>subject</b>
+   * <p>
+   * Description: <b>The subject of the set of documents</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DocumentManifest.subject</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DocumentManifest:subject</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("DocumentManifest:subject").toLocked();
 
+ /**
+   * Search parameter: <b>author</b>
+   * <p>
+   * Description: <b>Who and/or what authored the manifest</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DocumentManifest.author</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="author", path="DocumentManifest.author", description="Who and/or what authored the manifest", type="reference" )
   public static final String SP_AUTHOR = "author";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>author</b>
+   * <p>
+   * Description: <b>Who and/or what authored the manifest</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DocumentManifest.author</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam AUTHOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_AUTHOR);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DocumentManifest:author</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_AUTHOR = new ca.uhn.fhir.model.api.Include("DocumentManifest:author").toLocked();
 
+ /**
+   * Search parameter: <b>created</b>
+   * <p>
+   * Description: <b>When this document manifest created</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>DocumentManifest.created</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="created", path="DocumentManifest.created", description="When this document manifest created", type="date" )
   public static final String SP_CREATED = "created";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>created</b>
+   * <p>
+   * Description: <b>When this document manifest created</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>DocumentManifest.created</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam CREATED = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_CREATED);
+
+ /**
+   * Search parameter: <b>description</b>
+   * <p>
+   * Description: <b>Human-readable description (title)</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>DocumentManifest.description</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="description", path="DocumentManifest.description", description="Human-readable description (title)", type="string" )
   public static final String SP_DESCRIPTION = "description";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>description</b>
+   * <p>
+   * Description: <b>Human-readable description (title)</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>DocumentManifest.description</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.StringClientParam DESCRIPTION = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_DESCRIPTION);
+
+ /**
+   * Search parameter: <b>source</b>
+   * <p>
+   * Description: <b>The source system/application/software</b><br>
+   * Type: <b>uri</b><br>
+   * Path: <b>DocumentManifest.source</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="source", path="DocumentManifest.source", description="The source system/application/software", type="uri" )
   public static final String SP_SOURCE = "source";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>source</b>
+   * <p>
+   * Description: <b>The source system/application/software</b><br>
+   * Type: <b>uri</b><br>
+   * Path: <b>DocumentManifest.source</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.UriClientParam SOURCE = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_SOURCE);
+
+ /**
+   * Search parameter: <b>type</b>
+   * <p>
+   * Description: <b>Kind of document set</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DocumentManifest.type</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="type", path="DocumentManifest.type", description="Kind of document set", type="token" )
   public static final String SP_TYPE = "type";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>type</b>
+   * <p>
+   * Description: <b>Kind of document set</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DocumentManifest.type</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE);
+
+ /**
+   * Search parameter: <b>related-ref</b>
+   * <p>
+   * Description: <b>Related Resource</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DocumentManifest.related.ref</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="related-ref", path="DocumentManifest.related.ref", description="Related Resource", type="reference" )
   public static final String SP_RELATED_REF = "related-ref";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>related-ref</b>
+   * <p>
+   * Description: <b>Related Resource</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DocumentManifest.related.ref</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RELATED_REF = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RELATED_REF);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DocumentManifest:related-ref</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_RELATED_REF = new ca.uhn.fhir.model.api.Include("DocumentManifest:related-ref").toLocked();
 
+ /**
+   * Search parameter: <b>patient</b>
+   * <p>
+   * Description: <b>The subject of the set of documents</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DocumentManifest.subject</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="patient", path="DocumentManifest.subject", description="The subject of the set of documents", type="reference" )
   public static final String SP_PATIENT = "patient";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>patient</b>
+   * <p>
+   * Description: <b>The subject of the set of documents</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DocumentManifest.subject</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DocumentManifest:patient</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("DocumentManifest:patient").toLocked();
 
+ /**
+   * Search parameter: <b>recipient</b>
+   * <p>
+   * Description: <b>Intended to get notified about this set of documents</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DocumentManifest.recipient</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="recipient", path="DocumentManifest.recipient", description="Intended to get notified about this set of documents", type="reference" )
   public static final String SP_RECIPIENT = "recipient";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>recipient</b>
+   * <p>
+   * Description: <b>Intended to get notified about this set of documents</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DocumentManifest.recipient</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RECIPIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RECIPIENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DocumentManifest:recipient</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_RECIPIENT = new ca.uhn.fhir.model.api.Include("DocumentManifest:recipient").toLocked();
 
+ /**
+   * Search parameter: <b>status</b>
+   * <p>
+   * Description: <b>current | superseded | entered-in-error</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DocumentManifest.status</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="status", path="DocumentManifest.status", description="current | superseded | entered-in-error", type="token" )
   public static final String SP_STATUS = "status";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>status</b>
+   * <p>
+   * Description: <b>current | superseded | entered-in-error</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DocumentManifest.status</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS);
+
 
 }
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DocumentReference.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -2145,106 +2145,574 @@ public class DocumentReference extends DomainResource {
     return ResourceType.DocumentReference;
    }
 
+ /**
+   * Search parameter: <b>securitylabel</b>
+   * <p>
+   * Description: <b>Document security-tags</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DocumentReference.securityLabel</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="securitylabel", path="DocumentReference.securityLabel", description="Document security-tags", type="token" )
   public static final String SP_SECURITYLABEL = "securitylabel";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>securitylabel</b>
+   * <p>
+   * Description: <b>Document security-tags</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DocumentReference.securityLabel</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam SECURITYLABEL = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SECURITYLABEL);
+
+ /**
+   * Search parameter: <b>subject</b>
+   * <p>
+   * Description: <b>Who/what is the subject of the document</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DocumentReference.subject</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="subject", path="DocumentReference.subject", description="Who/what is the subject of the document", type="reference" )
   public static final String SP_SUBJECT = "subject";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>subject</b>
+   * <p>
+   * Description: <b>Who/what is the subject of the document</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DocumentReference.subject</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DocumentReference:subject</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("DocumentReference:subject").toLocked();
 
+ /**
+   * Search parameter: <b>description</b>
+   * <p>
+   * Description: <b>Human-readable description (title)</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>DocumentReference.description</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="description", path="DocumentReference.description", description="Human-readable description (title)", type="string" )
   public static final String SP_DESCRIPTION = "description";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>description</b>
+   * <p>
+   * Description: <b>Human-readable description (title)</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>DocumentReference.description</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.StringClientParam DESCRIPTION = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_DESCRIPTION);
+
+ /**
+   * Search parameter: <b>language</b>
+   * <p>
+   * Description: <b>Human language of the content (BCP-47)</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DocumentReference.content.attachment.language</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="language", path="DocumentReference.content.attachment.language", description="Human language of the content (BCP-47)", type="token" )
   public static final String SP_LANGUAGE = "language";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>language</b>
+   * <p>
+   * Description: <b>Human language of the content (BCP-47)</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DocumentReference.content.attachment.language</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam LANGUAGE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_LANGUAGE);
+
+ /**
+   * Search parameter: <b>type</b>
+   * <p>
+   * Description: <b>Kind of document (LOINC if possible)</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DocumentReference.type</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="type", path="DocumentReference.type", description="Kind of document (LOINC if possible)", type="token" )
   public static final String SP_TYPE = "type";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>type</b>
+   * <p>
+   * Description: <b>Kind of document (LOINC if possible)</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DocumentReference.type</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE);
+
+ /**
+   * Search parameter: <b>relation</b>
+   * <p>
+   * Description: <b>replaces | transforms | signs | appends</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DocumentReference.relatesTo.code</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="relation", path="DocumentReference.relatesTo.code", description="replaces | transforms | signs | appends", type="token" )
   public static final String SP_RELATION = "relation";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>relation</b>
+   * <p>
+   * Description: <b>replaces | transforms | signs | appends</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DocumentReference.relatesTo.code</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam RELATION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_RELATION);
+
+ /**
+   * Search parameter: <b>setting</b>
+   * <p>
+   * Description: <b>Additional details about where the content was created (e.g. clinical specialty)</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DocumentReference.context.practiceSetting</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="setting", path="DocumentReference.context.practiceSetting", description="Additional details about where the content was created (e.g. clinical specialty)", type="token" )
   public static final String SP_SETTING = "setting";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>setting</b>
+   * <p>
+   * Description: <b>Additional details about where the content was created (e.g. clinical specialty)</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DocumentReference.context.practiceSetting</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam SETTING = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SETTING);
+
+ /**
+   * Search parameter: <b>patient</b>
+   * <p>
+   * Description: <b>Who/what is the subject of the document</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DocumentReference.subject</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="patient", path="DocumentReference.subject", description="Who/what is the subject of the document", type="reference" )
   public static final String SP_PATIENT = "patient";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>patient</b>
+   * <p>
+   * Description: <b>Who/what is the subject of the document</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DocumentReference.subject</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DocumentReference:patient</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("DocumentReference:patient").toLocked();
 
+ /**
+   * Search parameter: <b>relationship</b>
+   * <p>
+   * Description: <b>Combination of relation and relatesTo</b><br>
+   * Type: <b>composite</b><br>
+   * Path: <b></b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="relationship", path="", description="Combination of relation and relatesTo", type="composite" )
   public static final String SP_RELATIONSHIP = "relationship";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>relationship</b>
+   * <p>
+   * Description: <b>Combination of relation and relatesTo</b><br>
+   * Type: <b>composite</b><br>
+   * Path: <b></b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.CompositeClientParam RELATIONSHIP = new ca.uhn.fhir.rest.gclient.CompositeClientParam(SP_RELATIONSHIP);
+
+ /**
+   * Search parameter: <b>event</b>
+   * <p>
+   * Description: <b>Main Clinical Acts Documented</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DocumentReference.context.event</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="event", path="DocumentReference.context.event", description="Main Clinical Acts Documented", type="token" )
   public static final String SP_EVENT = "event";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>event</b>
+   * <p>
+   * Description: <b>Main Clinical Acts Documented</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DocumentReference.context.event</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam EVENT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_EVENT);
+
+ /**
+   * Search parameter: <b>class</b>
+   * <p>
+   * Description: <b>Categorization of document</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DocumentReference.class</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="class", path="DocumentReference.class", description="Categorization of document", type="token" )
   public static final String SP_CLASS = "class";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>class</b>
+   * <p>
+   * Description: <b>Categorization of document</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DocumentReference.class</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam CLASS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_CLASS);
+
+ /**
+   * Search parameter: <b>authenticator</b>
+   * <p>
+   * Description: <b>Who/what authenticated the document</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DocumentReference.authenticator</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="authenticator", path="DocumentReference.authenticator", description="Who/what authenticated the document", type="reference" )
   public static final String SP_AUTHENTICATOR = "authenticator";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>authenticator</b>
+   * <p>
+   * Description: <b>Who/what authenticated the document</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DocumentReference.authenticator</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam AUTHENTICATOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_AUTHENTICATOR);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DocumentReference:authenticator</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_AUTHENTICATOR = new ca.uhn.fhir.model.api.Include("DocumentReference:authenticator").toLocked();
 
+ /**
+   * Search parameter: <b>identifier</b>
+   * <p>
+   * Description: <b>Master Version Specific Identifier</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DocumentReference.masterIdentifier, DocumentReference.identifier</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="identifier", path="DocumentReference.masterIdentifier|DocumentReference.identifier", description="Master Version Specific Identifier", type="token" )
   public static final String SP_IDENTIFIER = "identifier";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>identifier</b>
+   * <p>
+   * Description: <b>Master Version Specific Identifier</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DocumentReference.masterIdentifier, DocumentReference.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
+
+ /**
+   * Search parameter: <b>period</b>
+   * <p>
+   * Description: <b>Time of service that is being documented</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>DocumentReference.context.period</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="period", path="DocumentReference.context.period", description="Time of service that is being documented", type="date" )
   public static final String SP_PERIOD = "period";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>period</b>
+   * <p>
+   * Description: <b>Time of service that is being documented</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>DocumentReference.context.period</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam PERIOD = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_PERIOD);
+
+ /**
+   * Search parameter: <b>related-id</b>
+   * <p>
+   * Description: <b>Identifier of related objects or events</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DocumentReference.context.related.identifier</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="related-id", path="DocumentReference.context.related.identifier", description="Identifier of related objects or events", type="token" )
   public static final String SP_RELATED_ID = "related-id";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>related-id</b>
+   * <p>
+   * Description: <b>Identifier of related objects or events</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DocumentReference.context.related.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam RELATED_ID = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_RELATED_ID);
+
+ /**
+   * Search parameter: <b>custodian</b>
+   * <p>
+   * Description: <b>Organization which maintains the document</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DocumentReference.custodian</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="custodian", path="DocumentReference.custodian", description="Organization which maintains the document", type="reference" )
   public static final String SP_CUSTODIAN = "custodian";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>custodian</b>
+   * <p>
+   * Description: <b>Organization which maintains the document</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DocumentReference.custodian</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam CUSTODIAN = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_CUSTODIAN);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DocumentReference:custodian</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_CUSTODIAN = new ca.uhn.fhir.model.api.Include("DocumentReference:custodian").toLocked();
 
+ /**
+   * Search parameter: <b>indexed</b>
+   * <p>
+   * Description: <b>When this document reference created</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>DocumentReference.indexed</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="indexed", path="DocumentReference.indexed", description="When this document reference created", type="date" )
   public static final String SP_INDEXED = "indexed";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>indexed</b>
+   * <p>
+   * Description: <b>When this document reference created</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>DocumentReference.indexed</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam INDEXED = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_INDEXED);
+
+ /**
+   * Search parameter: <b>author</b>
+   * <p>
+   * Description: <b>Who and/or what authored the document</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DocumentReference.author</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="author", path="DocumentReference.author", description="Who and/or what authored the document", type="reference" )
   public static final String SP_AUTHOR = "author";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>author</b>
+   * <p>
+   * Description: <b>Who and/or what authored the document</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DocumentReference.author</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam AUTHOR = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_AUTHOR);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DocumentReference:author</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_AUTHOR = new ca.uhn.fhir.model.api.Include("DocumentReference:author").toLocked();
 
+ /**
+   * Search parameter: <b>created</b>
+   * <p>
+   * Description: <b>Document creation time</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>DocumentReference.created</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="created", path="DocumentReference.created", description="Document creation time", type="date" )
   public static final String SP_CREATED = "created";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>created</b>
+   * <p>
+   * Description: <b>Document creation time</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>DocumentReference.created</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam CREATED = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_CREATED);
+
+ /**
+   * Search parameter: <b>format</b>
+   * <p>
+   * Description: <b>Format/content rules for the document</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DocumentReference.content.format</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="format", path="DocumentReference.content.format", description="Format/content rules for the document", type="token" )
   public static final String SP_FORMAT = "format";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>format</b>
+   * <p>
+   * Description: <b>Format/content rules for the document</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DocumentReference.content.format</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam FORMAT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_FORMAT);
+
+ /**
+   * Search parameter: <b>encounter</b>
+   * <p>
+   * Description: <b>Context of the document  content</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DocumentReference.context.encounter</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="encounter", path="DocumentReference.context.encounter", description="Context of the document  content", type="reference" )
   public static final String SP_ENCOUNTER = "encounter";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>encounter</b>
+   * <p>
+   * Description: <b>Context of the document  content</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DocumentReference.context.encounter</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ENCOUNTER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ENCOUNTER);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DocumentReference:encounter</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_ENCOUNTER = new ca.uhn.fhir.model.api.Include("DocumentReference:encounter").toLocked();
 
+ /**
+   * Search parameter: <b>related-ref</b>
+   * <p>
+   * Description: <b>Related Resource</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DocumentReference.context.related.ref</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="related-ref", path="DocumentReference.context.related.ref", description="Related Resource", type="reference" )
   public static final String SP_RELATED_REF = "related-ref";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>related-ref</b>
+   * <p>
+   * Description: <b>Related Resource</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DocumentReference.context.related.ref</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RELATED_REF = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RELATED_REF);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DocumentReference:related-ref</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_RELATED_REF = new ca.uhn.fhir.model.api.Include("DocumentReference:related-ref").toLocked();
 
+ /**
+   * Search parameter: <b>location</b>
+   * <p>
+   * Description: <b>Uri where the data can be found</b><br>
+   * Type: <b>uri</b><br>
+   * Path: <b>DocumentReference.content.attachment.url</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="location", path="DocumentReference.content.attachment.url", description="Uri where the data can be found", type="uri" )
   public static final String SP_LOCATION = "location";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>location</b>
+   * <p>
+   * Description: <b>Uri where the data can be found</b><br>
+   * Type: <b>uri</b><br>
+   * Path: <b>DocumentReference.content.attachment.url</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.UriClientParam LOCATION = new ca.uhn.fhir.rest.gclient.UriClientParam(SP_LOCATION);
+
+ /**
+   * Search parameter: <b>relatesto</b>
+   * <p>
+   * Description: <b>Target of the relationship</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DocumentReference.relatesTo.target</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="relatesto", path="DocumentReference.relatesTo.target", description="Target of the relationship", type="reference" )
   public static final String SP_RELATESTO = "relatesto";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>relatesto</b>
+   * <p>
+   * Description: <b>Target of the relationship</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>DocumentReference.relatesTo.target</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam RELATESTO = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_RELATESTO);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>DocumentReference:relatesto</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_RELATESTO = new ca.uhn.fhir.model.api.Include("DocumentReference:relatesto").toLocked();
 
+ /**
+   * Search parameter: <b>facility</b>
+   * <p>
+   * Description: <b>Kind of facility where patient was seen</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DocumentReference.context.facilityType</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="facility", path="DocumentReference.context.facilityType", description="Kind of facility where patient was seen", type="token" )
   public static final String SP_FACILITY = "facility";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>facility</b>
+   * <p>
+   * Description: <b>Kind of facility where patient was seen</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DocumentReference.context.facilityType</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam FACILITY = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_FACILITY);
+
+ /**
+   * Search parameter: <b>status</b>
+   * <p>
+   * Description: <b>current | superseded | entered-in-error</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DocumentReference.status</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="status", path="DocumentReference.status", description="current | superseded | entered-in-error", type="token" )
   public static final String SP_STATUS = "status";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>status</b>
+   * <p>
+   * Description: <b>current | superseded | entered-in-error</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>DocumentReference.status</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS);
+
 
 }
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/DomainResource.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Duration.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import ca.uhn.fhir.model.api.annotation.DatatypeDef;
 import ca.uhn.fhir.model.api.annotation.Block;

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Element.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/ElementDefinition.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EligibilityRequest.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -1061,36 +1061,144 @@ public class EligibilityRequest extends DomainResource {
     return ResourceType.EligibilityRequest;
    }
 
+ /**
+   * Search parameter: <b>identifier</b>
+   * <p>
+   * Description: <b>The business identifier of the Eligibility</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>EligibilityRequest.identifier</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="identifier", path="EligibilityRequest.identifier", description="The business identifier of the Eligibility", type="token" )
   public static final String SP_IDENTIFIER = "identifier";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>identifier</b>
+   * <p>
+   * Description: <b>The business identifier of the Eligibility</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>EligibilityRequest.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
+
+ /**
+   * Search parameter: <b>provider</b>
+   * <p>
+   * Description: <b>The reference to the provider</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>EligibilityRequest.provider</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="provider", path="EligibilityRequest.provider", description="The reference to the provider", type="reference" )
   public static final String SP_PROVIDER = "provider";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>provider</b>
+   * <p>
+   * Description: <b>The reference to the provider</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>EligibilityRequest.provider</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PROVIDER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PROVIDER);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>EligibilityRequest:provider</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PROVIDER = new ca.uhn.fhir.model.api.Include("EligibilityRequest:provider").toLocked();
 
+ /**
+   * Search parameter: <b>patient</b>
+   * <p>
+   * Description: <b>The reference to the patient</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>EligibilityRequest.patient</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="patient", path="EligibilityRequest.patient", description="The reference to the patient", type="reference" )
   public static final String SP_PATIENT = "patient";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>patient</b>
+   * <p>
+   * Description: <b>The reference to the patient</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>EligibilityRequest.patient</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>EligibilityRequest:patient</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("EligibilityRequest:patient").toLocked();
 
+ /**
+   * Search parameter: <b>created</b>
+   * <p>
+   * Description: <b>The creation date for the EOB</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>EligibilityRequest.created</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="created", path="EligibilityRequest.created", description="The creation date for the EOB", type="date" )
   public static final String SP_CREATED = "created";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>created</b>
+   * <p>
+   * Description: <b>The creation date for the EOB</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>EligibilityRequest.created</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam CREATED = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_CREATED);
+
+ /**
+   * Search parameter: <b>organization</b>
+   * <p>
+   * Description: <b>The reference to the providing organization</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>EligibilityRequest.organization</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="organization", path="EligibilityRequest.organization", description="The reference to the providing organization", type="reference" )
   public static final String SP_ORGANIZATION = "organization";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>organization</b>
+   * <p>
+   * Description: <b>The reference to the providing organization</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>EligibilityRequest.organization</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ORGANIZATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ORGANIZATION);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>EligibilityRequest:organization</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_ORGANIZATION = new ca.uhn.fhir.model.api.Include("EligibilityRequest:organization").toLocked();
 
+ /**
+   * Search parameter: <b>facility</b>
+   * <p>
+   * Description: <b>Facility responsible for the goods and services</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>EligibilityRequest.facility</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="facility", path="EligibilityRequest.facility", description="Facility responsible for the goods and services", type="reference" )
   public static final String SP_FACILITY = "facility";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>facility</b>
+   * <p>
+   * Description: <b>Facility responsible for the goods and services</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>EligibilityRequest.facility</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam FACILITY = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_FACILITY);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>EligibilityRequest:facility</b>".

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EligibilityResponse.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -1670,46 +1670,190 @@ public class EligibilityResponse extends DomainResource {
     return ResourceType.EligibilityResponse;
    }
 
+ /**
+   * Search parameter: <b>identifier</b>
+   * <p>
+   * Description: <b>The business identifier</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>EligibilityResponse.identifier</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="identifier", path="EligibilityResponse.identifier", description="The business identifier", type="token" )
   public static final String SP_IDENTIFIER = "identifier";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>identifier</b>
+   * <p>
+   * Description: <b>The business identifier</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>EligibilityResponse.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
+
+ /**
+   * Search parameter: <b>request</b>
+   * <p>
+   * Description: <b>The EligibilityRequest reference</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>EligibilityResponse.request</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="request", path="EligibilityResponse.request", description="The EligibilityRequest reference", type="reference" )
   public static final String SP_REQUEST = "request";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>request</b>
+   * <p>
+   * Description: <b>The EligibilityRequest reference</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>EligibilityResponse.request</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REQUEST = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REQUEST);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>EligibilityResponse:request</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_REQUEST = new ca.uhn.fhir.model.api.Include("EligibilityResponse:request").toLocked();
 
+ /**
+   * Search parameter: <b>disposition</b>
+   * <p>
+   * Description: <b>The contents of the disposition message</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>EligibilityResponse.disposition</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="disposition", path="EligibilityResponse.disposition", description="The contents of the disposition message", type="string" )
   public static final String SP_DISPOSITION = "disposition";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>disposition</b>
+   * <p>
+   * Description: <b>The contents of the disposition message</b><br>
+   * Type: <b>string</b><br>
+   * Path: <b>EligibilityResponse.disposition</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.StringClientParam DISPOSITION = new ca.uhn.fhir.rest.gclient.StringClientParam(SP_DISPOSITION);
+
+ /**
+   * Search parameter: <b>created</b>
+   * <p>
+   * Description: <b>The creation date</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>EligibilityResponse.created</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="created", path="EligibilityResponse.created", description="The creation date", type="date" )
   public static final String SP_CREATED = "created";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>created</b>
+   * <p>
+   * Description: <b>The creation date</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>EligibilityResponse.created</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam CREATED = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_CREATED);
+
+ /**
+   * Search parameter: <b>organization</b>
+   * <p>
+   * Description: <b>The organization which generated this resource</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>EligibilityResponse.organization</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="organization", path="EligibilityResponse.organization", description="The organization which generated this resource", type="reference" )
   public static final String SP_ORGANIZATION = "organization";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>organization</b>
+   * <p>
+   * Description: <b>The organization which generated this resource</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>EligibilityResponse.organization</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam ORGANIZATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_ORGANIZATION);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>EligibilityResponse:organization</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_ORGANIZATION = new ca.uhn.fhir.model.api.Include("EligibilityResponse:organization").toLocked();
 
+ /**
+   * Search parameter: <b>requestprovider</b>
+   * <p>
+   * Description: <b>Reference to the EligibilityRequest provider</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>EligibilityResponse.requestProvider</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="requestprovider", path="EligibilityResponse.requestProvider", description="Reference to the EligibilityRequest provider", type="reference" )
   public static final String SP_REQUESTPROVIDER = "requestprovider";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>requestprovider</b>
+   * <p>
+   * Description: <b>Reference to the EligibilityRequest provider</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>EligibilityResponse.requestProvider</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REQUESTPROVIDER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REQUESTPROVIDER);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>EligibilityResponse:requestprovider</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_REQUESTPROVIDER = new ca.uhn.fhir.model.api.Include("EligibilityResponse:requestprovider").toLocked();
 
+ /**
+   * Search parameter: <b>requestorganization</b>
+   * <p>
+   * Description: <b>Reference to the EligibilityRequest organization</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>EligibilityResponse.requestOrganization</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="requestorganization", path="EligibilityResponse.requestOrganization", description="Reference to the EligibilityRequest organization", type="reference" )
   public static final String SP_REQUESTORGANIZATION = "requestorganization";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>requestorganization</b>
+   * <p>
+   * Description: <b>Reference to the EligibilityRequest organization</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>EligibilityResponse.requestOrganization</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam REQUESTORGANIZATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_REQUESTORGANIZATION);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>EligibilityResponse:requestorganization</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_REQUESTORGANIZATION = new ca.uhn.fhir.model.api.Include("EligibilityResponse:requestorganization").toLocked();
 
+ /**
+   * Search parameter: <b>outcome</b>
+   * <p>
+   * Description: <b>The processing outcome</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>EligibilityResponse.outcome</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="outcome", path="EligibilityResponse.outcome", description="The processing outcome", type="token" )
   public static final String SP_OUTCOME = "outcome";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>outcome</b>
+   * <p>
+   * Description: <b>The processing outcome</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>EligibilityResponse.outcome</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam OUTCOME = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_OUTCOME);
+
 
 }
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Encounter.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -3069,112 +3069,472 @@ Not to be used when the patient is currently at the location
     return ResourceType.Encounter;
    }
 
+ /**
+   * Search parameter: <b>date</b>
+   * <p>
+   * Description: <b>A date within the period the Encounter lasted</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>Encounter.period</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="date", path="Encounter.period", description="A date within the period the Encounter lasted", type="date" )
   public static final String SP_DATE = "date";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>date</b>
+   * <p>
+   * Description: <b>A date within the period the Encounter lasted</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>Encounter.period</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam DATE = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_DATE);
+
+ /**
+   * Search parameter: <b>identifier</b>
+   * <p>
+   * Description: <b>Identifier(s) by which this encounter is known</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Encounter.identifier</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="identifier", path="Encounter.identifier", description="Identifier(s) by which this encounter is known", type="token" )
   public static final String SP_IDENTIFIER = "identifier";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>identifier</b>
+   * <p>
+   * Description: <b>Identifier(s) by which this encounter is known</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Encounter.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
+
+ /**
+   * Search parameter: <b>reason</b>
+   * <p>
+   * Description: <b>Reason the encounter takes place (code)</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Encounter.reason</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="reason", path="Encounter.reason", description="Reason the encounter takes place (code)", type="token" )
   public static final String SP_REASON = "reason";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>reason</b>
+   * <p>
+   * Description: <b>Reason the encounter takes place (code)</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Encounter.reason</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam REASON = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_REASON);
+
+ /**
+   * Search parameter: <b>episodeofcare</b>
+   * <p>
+   * Description: <b>Episode(s) of care that this encounter should be recorded against</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Encounter.episodeOfCare</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="episodeofcare", path="Encounter.episodeOfCare", description="Episode(s) of care that this encounter should be recorded against", type="reference" )
   public static final String SP_EPISODEOFCARE = "episodeofcare";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>episodeofcare</b>
+   * <p>
+   * Description: <b>Episode(s) of care that this encounter should be recorded against</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Encounter.episodeOfCare</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam EPISODEOFCARE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_EPISODEOFCARE);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Encounter:episodeofcare</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_EPISODEOFCARE = new ca.uhn.fhir.model.api.Include("Encounter:episodeofcare").toLocked();
 
+ /**
+   * Search parameter: <b>participant-type</b>
+   * <p>
+   * Description: <b>Role of participant in encounter</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Encounter.participant.type</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="participant-type", path="Encounter.participant.type", description="Role of participant in encounter", type="token" )
   public static final String SP_PARTICIPANT_TYPE = "participant-type";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>participant-type</b>
+   * <p>
+   * Description: <b>Role of participant in encounter</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Encounter.participant.type</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam PARTICIPANT_TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_PARTICIPANT_TYPE);
+
+ /**
+   * Search parameter: <b>incomingreferral</b>
+   * <p>
+   * Description: <b>The ReferralRequest that initiated this encounter</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Encounter.incomingReferral</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="incomingreferral", path="Encounter.incomingReferral", description="The ReferralRequest that initiated this encounter", type="reference" )
   public static final String SP_INCOMINGREFERRAL = "incomingreferral";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>incomingreferral</b>
+   * <p>
+   * Description: <b>The ReferralRequest that initiated this encounter</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Encounter.incomingReferral</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam INCOMINGREFERRAL = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_INCOMINGREFERRAL);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Encounter:incomingreferral</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_INCOMINGREFERRAL = new ca.uhn.fhir.model.api.Include("Encounter:incomingreferral").toLocked();
 
+ /**
+   * Search parameter: <b>practitioner</b>
+   * <p>
+   * Description: <b>Persons involved in the encounter other than the patient</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Encounter.participant.individual</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="practitioner", path="Encounter.participant.individual", description="Persons involved in the encounter other than the patient", type="reference" )
   public static final String SP_PRACTITIONER = "practitioner";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>practitioner</b>
+   * <p>
+   * Description: <b>Persons involved in the encounter other than the patient</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Encounter.participant.individual</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PRACTITIONER = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PRACTITIONER);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Encounter:practitioner</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PRACTITIONER = new ca.uhn.fhir.model.api.Include("Encounter:practitioner").toLocked();
 
+ /**
+   * Search parameter: <b>length</b>
+   * <p>
+   * Description: <b>Length of encounter in days</b><br>
+   * Type: <b>number</b><br>
+   * Path: <b>Encounter.length</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="length", path="Encounter.length", description="Length of encounter in days", type="number" )
   public static final String SP_LENGTH = "length";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>length</b>
+   * <p>
+   * Description: <b>Length of encounter in days</b><br>
+   * Type: <b>number</b><br>
+   * Path: <b>Encounter.length</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.NumberClientParam LENGTH = new ca.uhn.fhir.rest.gclient.NumberClientParam(SP_LENGTH);
+
+ /**
+   * Search parameter: <b>appointment</b>
+   * <p>
+   * Description: <b>The appointment that scheduled this encounter</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Encounter.appointment</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="appointment", path="Encounter.appointment", description="The appointment that scheduled this encounter", type="reference" )
   public static final String SP_APPOINTMENT = "appointment";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>appointment</b>
+   * <p>
+   * Description: <b>The appointment that scheduled this encounter</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Encounter.appointment</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam APPOINTMENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_APPOINTMENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Encounter:appointment</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_APPOINTMENT = new ca.uhn.fhir.model.api.Include("Encounter:appointment").toLocked();
 
+ /**
+   * Search parameter: <b>part-of</b>
+   * <p>
+   * Description: <b>Another Encounter this encounter is part of</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Encounter.partOf</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="part-of", path="Encounter.partOf", description="Another Encounter this encounter is part of", type="reference" )
   public static final String SP_PART_OF = "part-of";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>part-of</b>
+   * <p>
+   * Description: <b>Another Encounter this encounter is part of</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Encounter.partOf</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PART_OF = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PART_OF);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Encounter:part-of</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PART_OF = new ca.uhn.fhir.model.api.Include("Encounter:part-of").toLocked();
 
+ /**
+   * Search parameter: <b>procedure</b>
+   * <p>
+   * Description: <b>Reason the encounter takes place (resource)</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Encounter.indication</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="procedure", path="Encounter.indication", description="Reason the encounter takes place (resource)", type="reference" )
   public static final String SP_PROCEDURE = "procedure";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>procedure</b>
+   * <p>
+   * Description: <b>Reason the encounter takes place (resource)</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Encounter.indication</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PROCEDURE = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PROCEDURE);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Encounter:procedure</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PROCEDURE = new ca.uhn.fhir.model.api.Include("Encounter:procedure").toLocked();
 
+ /**
+   * Search parameter: <b>type</b>
+   * <p>
+   * Description: <b>Specific type of encounter</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Encounter.type</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="type", path="Encounter.type", description="Specific type of encounter", type="token" )
   public static final String SP_TYPE = "type";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>type</b>
+   * <p>
+   * Description: <b>Specific type of encounter</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Encounter.type</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam TYPE = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_TYPE);
+
+ /**
+   * Search parameter: <b>participant</b>
+   * <p>
+   * Description: <b>Persons involved in the encounter other than the patient</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Encounter.participant.individual</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="participant", path="Encounter.participant.individual", description="Persons involved in the encounter other than the patient", type="reference" )
   public static final String SP_PARTICIPANT = "participant";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>participant</b>
+   * <p>
+   * Description: <b>Persons involved in the encounter other than the patient</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Encounter.participant.individual</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PARTICIPANT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PARTICIPANT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Encounter:participant</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PARTICIPANT = new ca.uhn.fhir.model.api.Include("Encounter:participant").toLocked();
 
+ /**
+   * Search parameter: <b>condition</b>
+   * <p>
+   * Description: <b>Reason the encounter takes place (resource)</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Encounter.indication</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="condition", path="Encounter.indication", description="Reason the encounter takes place (resource)", type="reference" )
   public static final String SP_CONDITION = "condition";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>condition</b>
+   * <p>
+   * Description: <b>Reason the encounter takes place (resource)</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Encounter.indication</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam CONDITION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_CONDITION);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Encounter:condition</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_CONDITION = new ca.uhn.fhir.model.api.Include("Encounter:condition").toLocked();
 
+ /**
+   * Search parameter: <b>patient</b>
+   * <p>
+   * Description: <b>The patient present at the encounter</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Encounter.patient</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="patient", path="Encounter.patient", description="The patient present at the encounter", type="reference" )
   public static final String SP_PATIENT = "patient";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>patient</b>
+   * <p>
+   * Description: <b>The patient present at the encounter</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Encounter.patient</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Encounter:patient</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_PATIENT = new ca.uhn.fhir.model.api.Include("Encounter:patient").toLocked();
 
+ /**
+   * Search parameter: <b>location-period</b>
+   * <p>
+   * Description: <b>Time period during which the patient was present at the location</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>Encounter.location.period</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="location-period", path="Encounter.location.period", description="Time period during which the patient was present at the location", type="date" )
   public static final String SP_LOCATION_PERIOD = "location-period";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>location-period</b>
+   * <p>
+   * Description: <b>Time period during which the patient was present at the location</b><br>
+   * Type: <b>date</b><br>
+   * Path: <b>Encounter.location.period</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.DateClientParam LOCATION_PERIOD = new ca.uhn.fhir.rest.gclient.DateClientParam(SP_LOCATION_PERIOD);
+
+ /**
+   * Search parameter: <b>location</b>
+   * <p>
+   * Description: <b>Location the encounter takes place</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Encounter.location.location</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="location", path="Encounter.location.location", description="Location the encounter takes place", type="reference" )
   public static final String SP_LOCATION = "location";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>location</b>
+   * <p>
+   * Description: <b>Location the encounter takes place</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Encounter.location.location</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam LOCATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_LOCATION);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Encounter:location</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_LOCATION = new ca.uhn.fhir.model.api.Include("Encounter:location").toLocked();
 
+ /**
+   * Search parameter: <b>indication</b>
+   * <p>
+   * Description: <b>Reason the encounter takes place (resource)</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Encounter.indication</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="indication", path="Encounter.indication", description="Reason the encounter takes place (resource)", type="reference" )
   public static final String SP_INDICATION = "indication";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>indication</b>
+   * <p>
+   * Description: <b>Reason the encounter takes place (resource)</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>Encounter.indication</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam INDICATION = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_INDICATION);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>Encounter:indication</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_INDICATION = new ca.uhn.fhir.model.api.Include("Encounter:indication").toLocked();
 
+ /**
+   * Search parameter: <b>special-arrangement</b>
+   * <p>
+   * Description: <b>Wheelchair, translator, stretcher, etc.</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Encounter.hospitalization.specialArrangement</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="special-arrangement", path="Encounter.hospitalization.specialArrangement", description="Wheelchair, translator, stretcher, etc.", type="token" )
   public static final String SP_SPECIAL_ARRANGEMENT = "special-arrangement";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>special-arrangement</b>
+   * <p>
+   * Description: <b>Wheelchair, translator, stretcher, etc.</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Encounter.hospitalization.specialArrangement</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam SPECIAL_ARRANGEMENT = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_SPECIAL_ARRANGEMENT);
+
+ /**
+   * Search parameter: <b>status</b>
+   * <p>
+   * Description: <b>planned | arrived | in-progress | onleave | finished | cancelled</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Encounter.status</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="status", path="Encounter.status", description="planned | arrived | in-progress | onleave | finished | cancelled", type="token" )
   public static final String SP_STATUS = "status";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>status</b>
+   * <p>
+   * Description: <b>planned | arrived | in-progress | onleave | finished | cancelled</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>Encounter.status</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam STATUS = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_STATUS);
+
 
 }
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EnrollmentRequest.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -691,18 +691,72 @@ public class EnrollmentRequest extends DomainResource {
     return ResourceType.EnrollmentRequest;
    }
 
+ /**
+   * Search parameter: <b>identifier</b>
+   * <p>
+   * Description: <b>The business identifier of the Enrollment</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>EnrollmentRequest.identifier</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="identifier", path="EnrollmentRequest.identifier", description="The business identifier of the Enrollment", type="token" )
   public static final String SP_IDENTIFIER = "identifier";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>identifier</b>
+   * <p>
+   * Description: <b>The business identifier of the Enrollment</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>EnrollmentRequest.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
+
+ /**
+   * Search parameter: <b>subject</b>
+   * <p>
+   * Description: <b>The party to be enrolled</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>EnrollmentRequest.subject</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="subject", path="EnrollmentRequest.subject", description="The party to be enrolled", type="reference" )
   public static final String SP_SUBJECT = "subject";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>subject</b>
+   * <p>
+   * Description: <b>The party to be enrolled</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>EnrollmentRequest.subject</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam SUBJECT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_SUBJECT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>EnrollmentRequest:subject</b>".
    */
   public static final ca.uhn.fhir.model.api.Include INCLUDE_SUBJECT = new ca.uhn.fhir.model.api.Include("EnrollmentRequest:subject").toLocked();
 
+ /**
+   * Search parameter: <b>patient</b>
+   * <p>
+   * Description: <b>The party to be enrolled</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>EnrollmentRequest.subject</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="patient", path="EnrollmentRequest.subject", description="The party to be enrolled", type="reference" )
   public static final String SP_PATIENT = "patient";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>patient</b>
+   * <p>
+   * Description: <b>The party to be enrolled</b><br>
+   * Type: <b>reference</b><br>
+   * Path: <b>EnrollmentRequest.subject</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.ReferenceClientParam PATIENT = new ca.uhn.fhir.rest.gclient.ReferenceClientParam(SP_PATIENT);
+
 /**
    * Constant for fluent queries to be used to add include statements. Specifies
    * the path value of "<b>EnrollmentRequest:patient</b>".

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/EnrollmentResponse.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 import java.util.*;
 
@@ -707,8 +707,26 @@ public class EnrollmentResponse extends DomainResource {
     return ResourceType.EnrollmentResponse;
    }
 
+ /**
+   * Search parameter: <b>identifier</b>
+   * <p>
+   * Description: <b>The business identifier of the Explanation of Benefit</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>EnrollmentResponse.identifier</b><br>
+   * </p>
+   */
   @SearchParamDefinition(name="identifier", path="EnrollmentResponse.identifier", description="The business identifier of the Explanation of Benefit", type="token" )
   public static final String SP_IDENTIFIER = "identifier";
+ /**
+   * <b>Fluent Client</b> search parameter constant for <b>identifier</b>
+   * <p>
+   * Description: <b>The business identifier of the Explanation of Benefit</b><br>
+   * Type: <b>token</b><br>
+   * Path: <b>EnrollmentResponse.identifier</b><br>
+   * </p>
+   */
+  public static final ca.uhn.fhir.rest.gclient.TokenClientParam IDENTIFIER = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_IDENTIFIER);
+
 
 }
 

hapi-fhir-structures-dstu2.1/src/main/java/org/hl7/fhir/dstu21/model/Enumerations.java

@@ -29,7 +29,7 @@ package org.hl7.fhir.dstu21.model;
   
 */
 
-// Generated on Sun, Dec 20, 2015 20:55-0500 for FHIR v1.2.0
+// Generated on Mon, Dec 21, 2015 19:58-0500 for FHIR v1.2.0
 
 
 import org.hl7.fhir.instance.model.api.*;