Lots of work on refactoring

hapi-fhir-base/pom.xml

@@ -92,22 +92,6 @@
 			<optional>true</optional>
 		</dependency>
 
-		<!-- Client -->
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
-			<exclusions>
-				<exclusion>
-					<artifactId>commons-logging</artifactId>
-					<groupId>commons-logging</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpcore</artifactId>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
@@ -136,13 +120,6 @@
 			<scope>test</scope>
 		</dependency>
 
-		<!-- Server -->
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
 	</dependencies>
 
 	<build>

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

@@ -27,28 +27,18 @@ import java.util.*;
 import java.util.Map.Entry;
 
 import org.apache.commons.lang3.Validate;
-import org.hl7.fhir.instance.model.api.IBase;
+import org.hl7.fhir.instance.model.api.*;
-import org.hl7.fhir.instance.model.api.IBaseBundle;
-import org.hl7.fhir.instance.model.api.IBaseResource;
 
+import ca.uhn.fhir.context.api.AddProfileTagEnum;
 import ca.uhn.fhir.context.support.IContextValidationSupport;
 import ca.uhn.fhir.fluentpath.IFluentPath;
 import ca.uhn.fhir.i18n.HapiLocalizer;
-import ca.uhn.fhir.model.api.IElement;
+import ca.uhn.fhir.model.api.*;
-import ca.uhn.fhir.model.api.IFhirVersion;
-import ca.uhn.fhir.model.api.IResource;
 import ca.uhn.fhir.model.view.ViewGenerator;
 import ca.uhn.fhir.narrative.INarrativeGenerator;
 import ca.uhn.fhir.parser.*;
-import ca.uhn.fhir.rest.client.IGenericClient;
+import ca.uhn.fhir.rest.client.api.*;
-import ca.uhn.fhir.rest.client.IRestfulClientFactory;
+import ca.uhn.fhir.util.*;
-import ca.uhn.fhir.rest.client.apache.ApacheRestfulClientFactory;
-import ca.uhn.fhir.rest.client.api.IBasicClient;
-import ca.uhn.fhir.rest.client.api.IRestfulClient;
-import ca.uhn.fhir.rest.server.AddProfileTagEnum;
-import ca.uhn.fhir.rest.server.IVersionSpecificBundleFactory;
-import ca.uhn.fhir.util.FhirTerser;
-import ca.uhn.fhir.util.VersionUtil;
 import ca.uhn.fhir.validation.FhirValidator;
 
 /**
@@ -426,7 +416,11 @@ public class FhirContext {
 	 */
 	public IRestfulClientFactory getRestfulClientFactory() {
 		if (myRestfulClientFactory == null) {
-			myRestfulClientFactory = new ApacheRestfulClientFactory(this);
+			try {
+				myRestfulClientFactory = (IRestfulClientFactory) ReflectionUtil.newInstance(Class.forName("ca.uhn.fhir.rest.client.apache.ApacheRestfulClientFactory"), FhirContext.class, this);
+			} catch (ClassNotFoundException e) {
+				throw new ConfigurationException("hapi-fhir-client does not appear to be on the classpath");
+			}
 		}
 		return myRestfulClientFactory;
 	}
@@ -466,14 +460,6 @@ public class FhirContext {
 		return !myDefaultTypeForProfile.isEmpty();
 	}
 
-	/**
-	 * This method should be considered experimental and will likely change in future releases
-	 * of HAPI. Use with caution!
-	 */
-	public IVersionSpecificBundleFactory newBundleFactory() {
-		return myVersion.newBundleFactory(this);
-	}
-
 	/**
 	 * Creates a new FluentPath engine which can be used to exvaluate
 	 * path expressions over FHIR resources. Note that this engine will use the

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

@@ -24,10 +24,7 @@ import static org.apache.commons.lang3.StringUtils.isBlank;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.annotation.Annotation;
-import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.*;
-import java.lang.reflect.Field;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
 import java.util.*;
 import java.util.Map.Entry;
 
@@ -35,21 +32,11 @@ import org.apache.commons.io.IOUtils;
 import org.hl7.fhir.instance.model.api.*;
 
 import ca.uhn.fhir.context.RuntimeSearchParam.RuntimeSearchParamStatusEnum;
-import ca.uhn.fhir.model.api.ExtensionDt;
+import ca.uhn.fhir.model.api.*;
-import ca.uhn.fhir.model.api.IDatatype;
+import ca.uhn.fhir.model.api.annotation.*;
-import ca.uhn.fhir.model.api.IElement;
-import ca.uhn.fhir.model.api.IResource;
-import ca.uhn.fhir.model.api.IResourceBlock;
-import ca.uhn.fhir.model.api.IValueSetEnumBinder;
-import ca.uhn.fhir.model.api.annotation.Block;
-import ca.uhn.fhir.model.api.annotation.Child;
-import ca.uhn.fhir.model.api.annotation.Compartment;
-import ca.uhn.fhir.model.api.annotation.DatatypeDef;
-import ca.uhn.fhir.model.api.annotation.ResourceDef;
-import ca.uhn.fhir.model.api.annotation.SearchParamDefinition;
 import ca.uhn.fhir.model.primitive.BoundCodeDt;
 import ca.uhn.fhir.model.primitive.XhtmlDt;
-import ca.uhn.fhir.rest.method.RestSearchParameterTypeEnum;
+import ca.uhn.fhir.rest.api.RestSearchParameterTypeEnum;
 import ca.uhn.fhir.util.ReflectionUtil;
 
 class ModelScanner {

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

@@ -6,7 +6,7 @@ import java.util.*;
 
 import org.hl7.fhir.instance.model.api.IIdType;
 
-import ca.uhn.fhir.rest.method.RestSearchParameterTypeEnum;
+import ca.uhn.fhir.rest.api.RestSearchParameterTypeEnum;
 
 /*
  * #%L

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

@@ -1,4 +1,4 @@
-package ca.uhn.fhir.rest.server;
+package ca.uhn.fhir.context.api;
 
 import ca.uhn.fhir.context.FhirContext;
 

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

@@ -1,4 +1,4 @@
-package ca.uhn.fhir.rest.server;
+package ca.uhn.fhir.context.api;
 
 /*
  * #%L

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

@@ -1,4 +1,4 @@
-package ca.uhn.fhir.rest.server;
+package ca.uhn.fhir.context.api;
 
 /*
  * #%L
@@ -19,10 +19,7 @@ package ca.uhn.fhir.rest.server;
  * limitations under the License.
  * #L%
  */
-
+import java.util.*;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
 
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.instance.model.api.IPrimitiveType;
@@ -30,6 +27,9 @@ import org.hl7.fhir.instance.model.api.IPrimitiveType;
 import ca.uhn.fhir.model.api.Bundle;
 import ca.uhn.fhir.model.api.Include;
 import ca.uhn.fhir.model.valueset.BundleTypeEnum;
+import ca.uhn.fhir.rest.api.EncodingEnum;
+import ca.uhn.fhir.rest.api.server.IBundleProvider;
+import ca.uhn.fhir.rest.api.server.IRestfulServer;
 
 /**
  * This interface should be considered experimental and will likely change in future releases of HAPI. Use with caution!
@@ -40,7 +40,7 @@ public interface IVersionSpecificBundleFactory {
 
 	void addRootPropertiesToBundle(String theAuthor, String theServerBase, String theCompleteUrl, Integer theTotalResults, BundleTypeEnum theBundleType, IPrimitiveType<Date> theLastUpdated);
 
-	void initializeBundleFromBundleProvider(IRestfulServer<?> theServer, IBundleProvider theResult, EncodingEnum theResponseEncoding, String theServerBase, String theCompleteUrl, boolean thePrettyPrint,
+	void initializeBundleFromBundleProvider(IRestfulServer theServer, IBundleProvider theResult, EncodingEnum theResponseEncoding, String theServerBase, String theCompleteUrl, boolean thePrettyPrint,
 			int theOffset, Integer theCount, String theSearchId, BundleTypeEnum theBundleType, Set<Include> theIncludes);
 
 	Bundle getDstu1Bundle();

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

@@ -21,10 +21,7 @@ package ca.uhn.fhir.model.api;
  */
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
@@ -34,16 +31,9 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.context.RuntimeResourceDefinition;
 import ca.uhn.fhir.model.base.resource.ResourceMetadataMap;
-import ca.uhn.fhir.model.primitive.BoundCodeDt;
+import ca.uhn.fhir.model.primitive.*;
-import ca.uhn.fhir.model.primitive.DecimalDt;
+import ca.uhn.fhir.model.valueset.*;
-import ca.uhn.fhir.model.primitive.IdDt;
+import ca.uhn.fhir.rest.api.Constants;
-import ca.uhn.fhir.model.primitive.InstantDt;
-import ca.uhn.fhir.model.primitive.IntegerDt;
-import ca.uhn.fhir.model.primitive.StringDt;
-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.Constants;
 import ca.uhn.fhir.util.UrlUtil;
 
 public class Bundle extends BaseBundle /* implements IBase implements IElement */{

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

@@ -23,19 +23,14 @@ package ca.uhn.fhir.model.api;
 import java.io.InputStream;
 import java.util.Date;
 
-import org.hl7.fhir.instance.model.api.IBase;
+import org.hl7.fhir.instance.model.api.*;
-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;
+import ca.uhn.fhir.context.*;
-import ca.uhn.fhir.context.FhirVersionEnum;
+import ca.uhn.fhir.context.api.IVersionSpecificBundleFactory;
-import ca.uhn.fhir.context.RuntimeResourceDefinition;
 import ca.uhn.fhir.context.support.IContextValidationSupport;
 import ca.uhn.fhir.fluentpath.IFluentPath;
 import ca.uhn.fhir.rest.server.IResourceProvider;
 import ca.uhn.fhir.rest.server.IServerConformanceProvider;
-import ca.uhn.fhir.rest.server.IVersionSpecificBundleFactory;
 import ca.uhn.fhir.rest.server.RestfulServer;
 
 public interface IFhirVersion {

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

@@ -25,7 +25,7 @@ import java.io.Serializable;
 import java.util.List;
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.rest.method.QualifiedParamList;
+import ca.uhn.fhir.rest.api.QualifiedParamList;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
 
 public interface IQueryParameterAnd<T extends IQueryParameterOr<?>> extends Serializable {

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

@@ -25,7 +25,7 @@ import java.io.Serializable;
 import java.util.List;
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.rest.method.QualifiedParamList;
+import ca.uhn.fhir.rest.api.QualifiedParamList;
 
 public interface IQueryParameterOr<T extends IQueryParameterType> extends Serializable {
 

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

@@ -25,7 +25,7 @@ import org.apache.commons.codec.binary.Base64;
 import ca.uhn.fhir.model.api.BasePrimitive;
 import ca.uhn.fhir.model.api.annotation.DatatypeDef;
 import ca.uhn.fhir.model.api.annotation.SimpleSetter;
-import ca.uhn.fhir.rest.server.Constants;
+import ca.uhn.fhir.rest.api.Constants;
 
 @DatatypeDef(name = "base64Binary")
 public class Base64BinaryDt extends BasePrimitive<byte[]> {

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

@@ -26,19 +26,15 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank;
 import java.math.BigDecimal;
 import java.util.UUID;
 
-import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.*;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.Validate;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.hl7.fhir.instance.model.api.IAnyResource;
+import org.hl7.fhir.instance.model.api.*;
-import org.hl7.fhir.instance.model.api.IBaseResource;
-import org.hl7.fhir.instance.model.api.IIdType;
 
 import ca.uhn.fhir.model.api.IResource;
 import ca.uhn.fhir.model.api.annotation.DatatypeDef;
 import ca.uhn.fhir.model.api.annotation.SimpleSetter;
 import ca.uhn.fhir.parser.DataFormatException;
-import ca.uhn.fhir.rest.server.Constants;
+import ca.uhn.fhir.rest.api.Constants;
 import ca.uhn.fhir.util.UrlUtil;
 
 /**

hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative/BaseThymeleafNarrativeGenerator.java

@@ -21,17 +21,12 @@ package ca.uhn.fhir.narrative;
  */
 import static org.apache.commons.lang3.StringUtils.isBlank;
 
-import java.io.File;
+import java.io.*;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.*;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.hl7.fhir.instance.model.api.IBaseDatatype;
+import org.hl7.fhir.instance.model.api.*;
-import org.hl7.fhir.instance.model.api.IBaseResource;
-import org.hl7.fhir.instance.model.api.INarrative;
 import org.thymeleaf.IEngineConfiguration;
 import org.thymeleaf.TemplateEngine;
 import org.thymeleaf.cache.AlwaysValidCacheEntryValidity;
@@ -44,9 +39,7 @@ import org.thymeleaf.processor.IProcessor;
 import org.thymeleaf.processor.element.AbstractAttributeTagProcessor;
 import org.thymeleaf.processor.element.IElementTagStructureHandler;
 import org.thymeleaf.standard.StandardDialect;
-import org.thymeleaf.standard.expression.IStandardExpression;
+import org.thymeleaf.standard.expression.*;
-import org.thymeleaf.standard.expression.IStandardExpressionParser;
-import org.thymeleaf.standard.expression.StandardExpressions;
 import org.thymeleaf.templatemode.TemplateMode;
 import org.thymeleaf.templateresolver.DefaultTemplateResolver;
 import org.thymeleaf.templateresource.ITemplateResource;
@@ -56,7 +49,7 @@ import ca.uhn.fhir.context.ConfigurationException;
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.model.api.IDatatype;
 import ca.uhn.fhir.parser.DataFormatException;
-import ca.uhn.fhir.rest.server.Constants;
+import ca.uhn.fhir.rest.api.Constants;
 
 public abstract class BaseThymeleafNarrativeGenerator implements INarrativeGenerator {
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/narrative/DefaultThymeleafNarrativeGenerator.java

@@ -23,8 +23,6 @@ package ca.uhn.fhir.narrative;
 import java.util.ArrayList;
 import java.util.List;
 
-import ca.uhn.fhir.rest.server.RestfulServer;
-
 public class DefaultThymeleafNarrativeGenerator extends BaseThymeleafNarrativeGenerator implements INarrativeGenerator {
 
 	public static final String NARRATIVES_PROPERTIES = "classpath:ca/uhn/fhir/narrative/narratives.properties";

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

@@ -22,60 +22,19 @@ package ca.uhn.fhir.parser;
 import static org.apache.commons.lang3.StringUtils.isBlank;
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
-import java.io.IOException;
+import java.io.*;
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.io.Writer;
 import java.lang.reflect.Modifier;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.IdentityHashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
-import org.hl7.fhir.instance.model.api.IAnyResource;
+import org.hl7.fhir.instance.model.api.*;
-import org.hl7.fhir.instance.model.api.IBase;
-import org.hl7.fhir.instance.model.api.IBaseCoding;
-import org.hl7.fhir.instance.model.api.IBaseElement;
-import org.hl7.fhir.instance.model.api.IBaseHasExtensions;
-import org.hl7.fhir.instance.model.api.IBaseHasModifierExtensions;
-import org.hl7.fhir.instance.model.api.IBaseMetaType;
-import org.hl7.fhir.instance.model.api.IBaseReference;
-import org.hl7.fhir.instance.model.api.IBaseResource;
-import org.hl7.fhir.instance.model.api.IDomainResource;
-import org.hl7.fhir.instance.model.api.IIdType;
-import org.hl7.fhir.instance.model.api.IPrimitiveType;
 
-import ca.uhn.fhir.context.BaseRuntimeChildDefinition;
+import ca.uhn.fhir.context.*;
-import ca.uhn.fhir.context.BaseRuntimeDeclaredChildDefinition;
-import ca.uhn.fhir.context.BaseRuntimeElementCompositeDefinition;
-import ca.uhn.fhir.context.BaseRuntimeElementDefinition;
 import ca.uhn.fhir.context.BaseRuntimeElementDefinition.ChildTypeEnum;
-import ca.uhn.fhir.context.ConfigurationException;
+import ca.uhn.fhir.model.api.*;
-import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.context.FhirVersionEnum;
-import ca.uhn.fhir.context.RuntimeChildChoiceDefinition;
-import ca.uhn.fhir.context.RuntimeChildContainedResources;
-import ca.uhn.fhir.context.RuntimeChildNarrativeDefinition;
-import ca.uhn.fhir.context.RuntimeResourceDefinition;
-import ca.uhn.fhir.model.api.Bundle;
-import ca.uhn.fhir.model.api.IIdentifiableElement;
-import ca.uhn.fhir.model.api.IResource;
-import ca.uhn.fhir.model.api.ISupportsUndeclaredExtensions;
-import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum;
-import ca.uhn.fhir.model.api.Tag;
-import ca.uhn.fhir.model.api.TagList;
 import ca.uhn.fhir.model.primitive.IdDt;
-import ca.uhn.fhir.rest.server.Constants;
+import ca.uhn.fhir.rest.api.Constants;
 import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
 import ca.uhn.fhir.util.UrlUtil;
 

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

@@ -19,25 +19,14 @@ package ca.uhn.fhir.parser;
  * limitations under the License.
  * #L%
  */
+import java.io.*;
+import java.util.*;
 
-import java.io.IOException;
+import org.hl7.fhir.instance.model.api.*;
-import java.io.Reader;
-import java.io.Writer;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
 
-import org.hl7.fhir.instance.model.api.IAnyResource;
+import ca.uhn.fhir.context.*;
-import org.hl7.fhir.instance.model.api.IBaseResource;
+import ca.uhn.fhir.model.api.*;
-import org.hl7.fhir.instance.model.api.IIdType;
+import ca.uhn.fhir.rest.api.EncodingEnum;
-
-import ca.uhn.fhir.context.ConfigurationException;
-import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.context.ParserOptions;
-import ca.uhn.fhir.model.api.Bundle;
-import ca.uhn.fhir.model.api.IResource;
-import ca.uhn.fhir.model.api.TagList;
-import ca.uhn.fhir.rest.server.EncodingEnum;
 
 /**
  * A parser, which can be used to convert between HAPI FHIR model/structure objects, and their respective String wire

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

@@ -24,76 +24,30 @@ import static org.apache.commons.lang3.StringUtils.defaultString;
 import static org.apache.commons.lang3.StringUtils.isBlank;
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
-import java.io.IOException;
+import java.io.*;
-import java.io.Reader;
-import java.io.Writer;
 import java.math.BigDecimal;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 import org.apache.commons.lang3.text.WordUtils;
-import org.hl7.fhir.instance.model.api.IBase;
+import org.hl7.fhir.instance.model.api.*;
-import org.hl7.fhir.instance.model.api.IBaseBinary;
-import org.hl7.fhir.instance.model.api.IBaseBooleanDatatype;
-import org.hl7.fhir.instance.model.api.IBaseDecimalDatatype;
-import org.hl7.fhir.instance.model.api.IBaseExtension;
-import org.hl7.fhir.instance.model.api.IBaseHasExtensions;
-import org.hl7.fhir.instance.model.api.IBaseHasModifierExtensions;
-import org.hl7.fhir.instance.model.api.IBaseIntegerDatatype;
-import org.hl7.fhir.instance.model.api.IBaseResource;
-import org.hl7.fhir.instance.model.api.IDomainResource;
-import org.hl7.fhir.instance.model.api.IIdType;
-import org.hl7.fhir.instance.model.api.INarrative;
-import org.hl7.fhir.instance.model.api.IPrimitiveType;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
-import ca.uhn.fhir.context.BaseRuntimeChildDefinition;
+import ca.uhn.fhir.context.*;
-import ca.uhn.fhir.context.BaseRuntimeElementCompositeDefinition;
-import ca.uhn.fhir.context.BaseRuntimeElementDefinition;
 import ca.uhn.fhir.context.BaseRuntimeElementDefinition.ChildTypeEnum;
-import ca.uhn.fhir.context.ConfigurationException;
+import ca.uhn.fhir.model.api.*;
-import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.context.FhirVersionEnum;
-import ca.uhn.fhir.context.RuntimeChildContainedResources;
-import ca.uhn.fhir.context.RuntimeChildDeclaredExtensionDefinition;
-import ca.uhn.fhir.context.RuntimeChildNarrativeDefinition;
-import ca.uhn.fhir.context.RuntimeChildUndeclaredExtensionDefinition;
-import ca.uhn.fhir.context.RuntimeResourceDefinition;
-import ca.uhn.fhir.model.api.BaseBundle;
-import ca.uhn.fhir.model.api.Bundle;
-import ca.uhn.fhir.model.api.BundleEntry;
-import ca.uhn.fhir.model.api.ExtensionDt;
-import ca.uhn.fhir.model.api.IPrimitiveDatatype;
-import ca.uhn.fhir.model.api.IResource;
-import ca.uhn.fhir.model.api.ISupportsUndeclaredExtensions;
-import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum;
-import ca.uhn.fhir.model.api.Tag;
-import ca.uhn.fhir.model.api.TagList;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.base.composite.BaseCodingDt;
 import ca.uhn.fhir.model.base.composite.BaseContainedDt;
-import ca.uhn.fhir.model.primitive.DecimalDt;
+import ca.uhn.fhir.model.primitive.*;
-import ca.uhn.fhir.model.primitive.IdDt;
-import ca.uhn.fhir.model.primitive.InstantDt;
-import ca.uhn.fhir.model.primitive.IntegerDt;
-import ca.uhn.fhir.model.primitive.StringDt;
 import ca.uhn.fhir.narrative.INarrativeGenerator;
-import ca.uhn.fhir.parser.json.GsonStructure;
+import ca.uhn.fhir.parser.json.*;
-import ca.uhn.fhir.parser.json.JsonLikeArray;
-import ca.uhn.fhir.parser.json.JsonLikeObject;
-import ca.uhn.fhir.parser.json.JsonLikeStructure;
-import ca.uhn.fhir.parser.json.JsonLikeValue;
 import ca.uhn.fhir.parser.json.JsonLikeValue.ScalarType;
 import ca.uhn.fhir.parser.json.JsonLikeValue.ValueType;
-import ca.uhn.fhir.parser.json.JsonLikeWriter;
+import ca.uhn.fhir.rest.api.EncodingEnum;
-import ca.uhn.fhir.rest.server.EncodingEnum;
 import ca.uhn.fhir.util.ElementUtil;
 
 /**

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

@@ -39,17 +39,11 @@ import ca.uhn.fhir.model.api.*;
 import ca.uhn.fhir.model.api.annotation.Child;
 import ca.uhn.fhir.model.base.composite.BaseResourceReferenceDt;
 import ca.uhn.fhir.model.base.resource.ResourceMetadataMap;
-import ca.uhn.fhir.model.primitive.IdDt;
+import ca.uhn.fhir.model.primitive.*;
-import ca.uhn.fhir.model.primitive.InstantDt;
-import ca.uhn.fhir.model.primitive.StringDt;
-import ca.uhn.fhir.model.primitive.XhtmlDt;
 import ca.uhn.fhir.parser.json.JsonLikeValue.ScalarType;
 import ca.uhn.fhir.parser.json.JsonLikeValue.ValueType;
-import ca.uhn.fhir.rest.server.Constants;
+import ca.uhn.fhir.rest.api.Constants;
-import ca.uhn.fhir.util.BundleUtil;
+import ca.uhn.fhir.util.*;
-import ca.uhn.fhir.util.FhirTerser;
-import ca.uhn.fhir.util.IModelVisitor;
-import ca.uhn.fhir.util.ReflectionUtil;
 
 class ParserState<T> {
 

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

@@ -23,75 +23,25 @@ import static org.apache.commons.lang3.StringUtils.defaultString;
 import static org.apache.commons.lang3.StringUtils.isBlank;
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
-import java.io.IOException;
+import java.io.*;
-import java.io.Reader;
+import java.util.*;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
 
 import javax.xml.namespace.QName;
-import javax.xml.stream.FactoryConfigurationError;
+import javax.xml.stream.*;
-import javax.xml.stream.XMLEventReader;
+import javax.xml.stream.events.*;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-import javax.xml.stream.events.Attribute;
-import javax.xml.stream.events.Characters;
-import javax.xml.stream.events.Comment;
-import javax.xml.stream.events.EntityReference;
-import javax.xml.stream.events.Namespace;
-import javax.xml.stream.events.StartElement;
-import javax.xml.stream.events.XMLEvent;
 
 import org.apache.commons.lang3.StringUtils;
-import org.hl7.fhir.instance.model.api.IAnyResource;
+import org.hl7.fhir.instance.model.api.*;
-import org.hl7.fhir.instance.model.api.IBase;
-import org.hl7.fhir.instance.model.api.IBaseBinary;
-import org.hl7.fhir.instance.model.api.IBaseDatatype;
-import org.hl7.fhir.instance.model.api.IBaseExtension;
-import org.hl7.fhir.instance.model.api.IBaseHasExtensions;
-import org.hl7.fhir.instance.model.api.IBaseHasModifierExtensions;
-import org.hl7.fhir.instance.model.api.IBaseResource;
-import org.hl7.fhir.instance.model.api.IBaseXhtml;
-import org.hl7.fhir.instance.model.api.IDomainResource;
-import org.hl7.fhir.instance.model.api.IIdType;
-import org.hl7.fhir.instance.model.api.INarrative;
-import org.hl7.fhir.instance.model.api.IPrimitiveType;
 
-import ca.uhn.fhir.context.BaseRuntimeChildDefinition;
+import ca.uhn.fhir.context.*;
-import ca.uhn.fhir.context.BaseRuntimeDeclaredChildDefinition;
+import ca.uhn.fhir.model.api.*;
-import ca.uhn.fhir.context.BaseRuntimeElementDefinition;
-import ca.uhn.fhir.context.ConfigurationException;
-import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.context.FhirVersionEnum;
-import ca.uhn.fhir.context.RuntimeChildContainedResources;
-import ca.uhn.fhir.context.RuntimeChildExtension;
-import ca.uhn.fhir.context.RuntimeChildNarrativeDefinition;
-import ca.uhn.fhir.context.RuntimeChildUndeclaredExtensionDefinition;
-import ca.uhn.fhir.context.RuntimeResourceDefinition;
-import ca.uhn.fhir.model.api.BaseBundle;
-import ca.uhn.fhir.model.api.Bundle;
-import ca.uhn.fhir.model.api.BundleEntry;
-import ca.uhn.fhir.model.api.IResource;
-import ca.uhn.fhir.model.api.ISupportsUndeclaredExtensions;
-import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum;
-import ca.uhn.fhir.model.api.Tag;
-import ca.uhn.fhir.model.api.TagList;
 import ca.uhn.fhir.model.base.composite.BaseCodingDt;
-import ca.uhn.fhir.model.primitive.IdDt;
+import ca.uhn.fhir.model.primitive.*;
-import ca.uhn.fhir.model.primitive.InstantDt;
-import ca.uhn.fhir.model.primitive.StringDt;
-import ca.uhn.fhir.model.primitive.XhtmlDt;
 import ca.uhn.fhir.narrative.INarrativeGenerator;
-import ca.uhn.fhir.rest.server.Constants;
+import ca.uhn.fhir.rest.api.Constants;
-import ca.uhn.fhir.rest.server.EncodingEnum;
+import ca.uhn.fhir.rest.api.EncodingEnum;
 import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
-import ca.uhn.fhir.util.ElementUtil;
+import ca.uhn.fhir.util.*;
-import ca.uhn.fhir.util.NonPrettyPrintWriterWrapper;
-import ca.uhn.fhir.util.PrettyPrintWriterWrapper;
-import ca.uhn.fhir.util.XmlUtil;
 
 /**
  * This class is the FHIR XML parser/encoder. Users should not interact with this class directly, but should use

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Read.java

@@ -19,17 +19,12 @@ package ca.uhn.fhir.rest.annotation;
  * limitations under the License.
  * #L%
  */
-
+import java.lang.annotation.*;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
 
 import org.hl7.fhir.instance.model.api.IBaseResource;
 
 import ca.uhn.fhir.rest.client.api.IBasicClient;
 import ca.uhn.fhir.rest.client.api.IRestfulClient;
-import ca.uhn.fhir.rest.server.IResourceProvider;
 
 /**
  * RESTful method annotation to be used for the FHIR <a href="http://hl7.org/implement/standards/fhir/http.html#read">read</a> and <a
@@ -50,7 +45,7 @@ import ca.uhn.fhir.rest.server.IResourceProvider;
 public @interface Read {
 
 	/**
-	 * The return type for this method. This generally does not need to be populated for {@link IResourceProvider resource providers} in a server implementation, but often does need to be populated in
+	 * The return type for this method. This generally does not need to be populated for IResourceProvider in a server implementation, but often does need to be populated in
 	 * client implementations using {@link IBasicClient} or {@link IRestfulClient}, or in plain providers on a server.
 	 * <p>
 	 * This value also does not need to be populated if the return type for a method annotated with this annotation is sufficient to determine the type of resource provided. E.g. if the method returns

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/ResourceParam.java

@@ -19,13 +19,7 @@ package ca.uhn.fhir.rest.annotation;
  * limitations under the License.
  * #L%
  */
-
+import java.lang.annotation.*;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import ca.uhn.fhir.rest.server.IResourceProvider;
 
 /**
  * Denotes a parameter for a REST method which will contain the resource actually 
@@ -37,7 +31,7 @@ import ca.uhn.fhir.rest.server.IResourceProvider;
  * <p>
  * Parameters with this annotation should typically be of the type of resource being
  * operated on (see below for an exception when raw data is required). For example, in a
- * {@link IResourceProvider} for Patient resources, the parameter annotated with this
+ * IResourceProvider for Patient resources, the parameter annotated with this
  * annotation should be of type Patient. 
  * </p>
  * <p>

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Search.java

@@ -29,8 +29,6 @@ import org.hl7.fhir.instance.model.api.IBaseResource;
 
 import ca.uhn.fhir.rest.client.api.IBasicClient;
 import ca.uhn.fhir.rest.client.api.IRestfulClient;
-import ca.uhn.fhir.rest.server.IDynamicSearchResourceProvider;
-import ca.uhn.fhir.rest.server.IResourceProvider;
 
 
 /**
@@ -66,7 +64,7 @@ public @interface Search {
 
 	/**
 	 * The return type for this method. This generally does not need
-	 * to be populated for {@link IResourceProvider resource providers} in a server implementation, 
+	 * to be populated for IResourceProvider instances in a server implementation, 
 	 * but often does need to be populated in client implementations using {@link IBasicClient} or
 	 * {@link IRestfulClient}, or in plain providers on a server.
 	 * <p>
@@ -82,8 +80,6 @@ public @interface Search {
 
 	/**
 	 * This is an experimental option - Use with caution
-	 * 
-	 * @see IDynamicSearchResourceProvider
 	 */
 	boolean dynamic() default false;
 	

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Validate.java

@@ -27,7 +27,6 @@ import java.lang.annotation.Target;
 
 import ca.uhn.fhir.model.api.IResource;
 import ca.uhn.fhir.rest.api.ValidationModeEnum;
-import ca.uhn.fhir.rest.server.IResourceProvider;
 
 /**
  * RESTful method annotation to be used for the FHIR
@@ -50,7 +49,7 @@ public @interface Validate {
 
 	/**
 	 * The return type for this method. This generally does not need
-	 * to be populated for a server implementation (using a {@link IResourceProvider}, 
+	 * to be populated for a server implementation (using an IResourceProvider, 
 	 * since resource providers will return only one resource type per class, 
 	 * but generally does need to be populated for client implementations. 
 	 */

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/Constants.java

@@ -1,4 +1,4 @@
-package ca.uhn.fhir.rest.server;
+package ca.uhn.fhir.rest.api;
 
 /*
  * #%L
@@ -177,6 +177,7 @@ public class Constants {
 	public static final String TAG_SUBSETTED_SYSTEM = "http://hl7.org/fhir/v3/ObservationValue";
 	public static final String URL_TOKEN_HISTORY = "_history";
 	public static final String URL_TOKEN_METADATA = "metadata";
+	public static final String OO_INFOSTATUS_PROCESSING = "processing";
 
 	static {
 		CHARSET_UTF8 = Charset.forName(CHARSET_NAME_UTF8);

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/EncodingEnum.java

@@ -1,6 +1,4 @@
-package ca.uhn.fhir.rest.server;
+package ca.uhn.fhir.rest.api;
-
-import java.util.Collections;
 
 /*
  * #%L
@@ -21,9 +19,9 @@ import java.util.Collections;
  * limitations under the License.
  * #L%
  */
+import java.util.*;
 
-import java.util.HashMap;
+import org.apache.commons.lang3.ObjectUtils;
-import java.util.Map;
 
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.parser.IParser;
@@ -46,14 +44,14 @@ public enum EncodingEnum {
 
 	;
 
-	/** "xml" */
-	public static final String XML_PLAIN_STRING = "xml";
 	/** "json" */
 	public  static final String JSON_PLAIN_STRING = "json";
-	
 	private static Map<String, EncodingEnum> ourContentTypeToEncoding;
+	
 	private static Map<String, EncodingEnum> ourContentTypeToEncodingNonLegacy;
 	private static Map<String, EncodingEnum> ourContentTypeToEncodingStrict;
+	/** "xml" */
+	public static final String XML_PLAIN_STRING = "xml";
 
 	static {
 		ourContentTypeToEncoding = new HashMap<String, EncodingEnum>();
@@ -98,8 +96,8 @@ public enum EncodingEnum {
 
 	private String myBundleContentType;
 	private String myFormatContentType;
-	private String myResourceContentTypeNonLegacy;
 	private String myResourceContentTypeLegacy;
+	private String myResourceContentTypeNonLegacy;
 
 	EncodingEnum(String theResourceContentTypeLegacy, String theResourceContentType, String theBundleContentType, String theFormatContentType) {
 		myResourceContentTypeLegacy = theResourceContentTypeLegacy;
@@ -136,6 +134,27 @@ public enum EncodingEnum {
 
 	public abstract IParser newParser(FhirContext theContext);
 
+	public static EncodingEnum detectEncoding(String theBody) {
+		EncodingEnum retVal = detectEncodingNoDefault(theBody);
+		retVal = ObjectUtils.defaultIfNull(retVal, EncodingEnum.XML);
+		return retVal;
+	}
+
+	public static EncodingEnum detectEncodingNoDefault(String theBody) {
+		EncodingEnum retVal = null;
+		for (int i = 0; i < theBody.length() && retVal == null; i++) {
+			switch (theBody.charAt(i)) {
+				case '<':
+					retVal = EncodingEnum.XML;
+					break;
+				case '{':
+					retVal = EncodingEnum.JSON;
+					break;
+			}
+		}
+		return retVal;
+	}
+
 	/**
 	 * Returns the encoding for a given content type, or <code>null</code> if no encoding
 	 * is found. 
@@ -148,6 +167,7 @@ public enum EncodingEnum {
 		return ourContentTypeToEncoding.get(theContentType);
 	}
 
+
 	/**
 	 * Returns the encoding for a given content type, or <code>null</code> if no encoding
 	 * is found. 
@@ -164,5 +184,5 @@ public enum EncodingEnum {
 		return ourContentTypeToEncodingNonLegacy.containsKey(theFormat);
 	}
 
-
+	
 }

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/PatchTypeEnum.java

@@ -21,7 +21,6 @@ package ca.uhn.fhir.rest.api;
  */
 
 import ca.uhn.fhir.rest.annotation.Patch;
-import ca.uhn.fhir.rest.server.Constants;
 
 /**
  * Parameter type for methods annotated with {@link Patch}

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/QualifiedParamList.java

@@ -1,4 +1,4 @@
-package ca.uhn.fhir.rest.method;
+package ca.uhn.fhir.rest.api;
 
 import static org.apache.commons.lang3.StringUtils.isBlank;
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/RestSearchParameterTypeEnum.java

@@ -1,5 +1,5 @@
 
-package ca.uhn.fhir.rest.method;
+package ca.uhn.fhir.rest.api;
 
 /*
  * #%L

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/api/SearchStyleEnum.java

@@ -1,4 +1,4 @@
-package ca.uhn.fhir.rest.method;
+package ca.uhn.fhir.rest.api;
 
 /*
  * #%L

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

@@ -0,0 +1,13 @@
+package ca.uhn.fhir.rest.api.server;
+
+import java.util.*;
+
+public interface IRequestDetails {
+
+	Map<String, String[]> getParameters();
+
+	Map<String, List<String>> getUnqualifiedToQualifiedNames();
+
+	IRestfulServer getServer();
+
+}

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

@@ -0,0 +1,9 @@
+package ca.uhn.fhir.rest.api.server;
+
+import ca.uhn.fhir.context.FhirContext;
+
+public interface IRestfulServer {
+
+	FhirContext getFhirContext();
+
+}

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

@@ -0,0 +1,5 @@
+package ca.uhn.fhir.rest.api.server;
+
+public interface IServerMethodBinding {
+
+}

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

@@ -1,4 +1,4 @@
-package ca.uhn.fhir.rest.client;
+package ca.uhn.fhir.rest.client.api;
 
 /*
  * #%L
@@ -22,9 +22,6 @@ package ca.uhn.fhir.rest.client;
 
 import java.io.IOException;
 
-import ca.uhn.fhir.rest.client.api.IHttpRequest;
-import ca.uhn.fhir.rest.client.api.IHttpResponse;
-
 /**
  * This interface represents an interceptor which can be used to access (and optionally change or take actions upon)
  * requests that are being sent by the HTTP client, and responses received by it.

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

@@ -1,4 +1,4 @@
-package ca.uhn.fhir.rest.client;
+package ca.uhn.fhir.rest.client.api;
 
 /*
  * #%L
@@ -26,17 +26,11 @@ import java.util.Map;
 import org.hl7.fhir.instance.model.api.IBaseConformance;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 
-import ca.uhn.fhir.model.api.Bundle;
+import ca.uhn.fhir.model.api.*;
-import ca.uhn.fhir.model.api.IQueryParameterType;
+import ca.uhn.fhir.model.primitive.*;
-import ca.uhn.fhir.model.api.IResource;
-import ca.uhn.fhir.model.primitive.DateTimeDt;
-import ca.uhn.fhir.model.primitive.IdDt;
-import ca.uhn.fhir.model.primitive.UriDt;
 import ca.uhn.fhir.rest.api.MethodOutcome;
-import ca.uhn.fhir.rest.client.api.IRestfulClient;
 import ca.uhn.fhir.rest.client.exceptions.FhirClientConnectionException;
 import ca.uhn.fhir.rest.client.exceptions.FhirClientInappropriateForServerException;
-import ca.uhn.fhir.rest.client.interceptor.LoggingInterceptor;
 import ca.uhn.fhir.rest.gclient.*;
 
 public interface IGenericClient extends IRestfulClient {
@@ -281,7 +275,7 @@ public interface IGenericClient extends IRestfulClient {
 	 * 
 	 * @param theLogRequestAndResponse
 	 *            Should requests and responses be logged
-	 * @deprecated Use {@link LoggingInterceptor} as a client interceptor registered to your
+	 * @deprecated Use LoggingInterceptor as a client interceptor registered to your
 	 * client instead, as this provides much more fine-grained control over what is logged. This
 	 * method will be removed at some point (deprecated in HAPI 1.6 - 2016-06-16) 
 	 */

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

@@ -26,7 +26,7 @@ import java.util.Map;
 import org.hl7.fhir.instance.model.api.IBaseBinary;
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.rest.server.EncodingEnum;
+import ca.uhn.fhir.rest.api.EncodingEnum;
 
 /**
  * A HTTP Client interface.

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

@@ -24,9 +24,8 @@ package ca.uhn.fhir.rest.client.api;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 
 import ca.uhn.fhir.context.FhirContext;
+import ca.uhn.fhir.rest.api.EncodingEnum;
 import ca.uhn.fhir.rest.api.SummaryEnum;
-import ca.uhn.fhir.rest.client.IClientInterceptor;
-import ca.uhn.fhir.rest.server.EncodingEnum;
 
 public interface IRestfulClient {
 

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

@@ -1,4 +1,4 @@
-package ca.uhn.fhir.rest.client;
+package ca.uhn.fhir.rest.client.api;
 
 /*
  * #%L
@@ -25,9 +25,7 @@ import java.util.Map;
 
 import ca.uhn.fhir.context.ConfigurationException;
 import ca.uhn.fhir.rest.api.RequestTypeEnum;
-import ca.uhn.fhir.rest.client.api.Header;
+import ca.uhn.fhir.rest.client.api.*;
-import ca.uhn.fhir.rest.client.api.IHttpClient;
-import ca.uhn.fhir.rest.client.api.IRestfulClient;
 
 public interface IRestfulClientFactory {
 
@@ -252,11 +250,11 @@ public interface IRestfulClientFactory {
 	 */
 	void setPoolMaxPerRoute(int thePoolMaxPerRoute);
 	
-	void validateServerBase(String theServerBase, IHttpClient theHttpClient, BaseClient theClient);
+	void validateServerBase(String theServerBase, IHttpClient theHttpClient, IRestfulClient theClient);
 
 	/**
 	 * This method is internal to HAPI - It may change in future versions, use with caution.
 	 */	
-	void validateServerBaseIfConfiguredToDoSo(String theServerBase, IHttpClient theHttpClient, BaseClient theClient);
+	void validateServerBaseIfConfiguredToDoSo(String theServerBase, IHttpClient theHttpClient, IRestfulClient theClient);
 
 }

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

@@ -1,4 +1,4 @@
-package ca.uhn.fhir.rest.client;
+package ca.uhn.fhir.rest.client.api;
 
 /*
  * #%L

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

@@ -1,52 +0,0 @@
-package ca.uhn.fhir.rest.client.interceptor;
-
-/*
- * #%L
- * HAPI FHIR - Core Library
- * %%
- * Copyright (C) 2014 - 2017 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-import ca.uhn.fhir.rest.client.IClientInterceptor;
-import ca.uhn.fhir.rest.client.api.IHttpRequest;
-import ca.uhn.fhir.rest.client.api.IHttpResponse;
-import ca.uhn.fhir.rest.server.Constants;
-
-/**
- * HTTP interceptor to be used for adding Cookie to requests.
- * <p>
- * This interceptor adds a header resembling the following:<br>
- * &nbsp;&nbsp;&nbsp;<code>Cookie: [key]=[value]</code><br>
- * </p>
- */
-
-public class CookieInterceptor implements IClientInterceptor {
-	private final String sessionCookie;
-
-	public CookieInterceptor(String sessionCookie) {
-		this.sessionCookie = sessionCookie;
-	}
-
-	@Override
-	public void interceptRequest(IHttpRequest theRequest) {
-		theRequest.addHeader(Constants.HEADER_COOKIE, sessionCookie); //$NON-NLS-1$
-	}
-
-	@Override
-	public void interceptResponse(IHttpResponse theResponse) {
-		// nothing
-	}
-}

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/BaseClientParam.java

@@ -1,28 +1,7 @@
 package ca.uhn.fhir.rest.gclient;
 
 import ca.uhn.fhir.context.FhirContext;
-
+import ca.uhn.fhir.rest.api.Constants;
-/*
- * #%L
- * HAPI FHIR - Core Library
- * %%
- * Copyright (C) 2014 - 2017 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-import ca.uhn.fhir.rest.server.Constants;
 
 abstract class BaseClientParam implements IParam {
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/ICreateTyped.java

@@ -23,7 +23,7 @@ package ca.uhn.fhir.rest.gclient;
 import ca.uhn.fhir.model.primitive.IdDt;
 import ca.uhn.fhir.rest.api.MethodOutcome;
 import ca.uhn.fhir.rest.api.PreferReturnEnum;
-import ca.uhn.fhir.rest.client.IGenericClient;
+import ca.uhn.fhir.rest.client.api.IGenericClient;
 
 public interface ICreateTyped extends IClientExecutable<ICreateTyped, MethodOutcome> {
 	

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IQuery.java

@@ -25,7 +25,7 @@ import java.util.Collection;
 import org.hl7.fhir.instance.model.api.IBaseBundle;
 
 import ca.uhn.fhir.model.api.Include;
-import ca.uhn.fhir.rest.method.SearchStyleEnum;
+import ca.uhn.fhir.rest.api.SearchStyleEnum;
 import ca.uhn.fhir.rest.param.DateRangeParam;
 
 public interface IQuery<T> extends IClientExecutable<IQuery<T>, T>, IBaseQuery<IQuery<T>> {

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/StringClientParam.java

@@ -24,7 +24,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import ca.uhn.fhir.model.primitive.StringDt;
-import ca.uhn.fhir.rest.server.Constants;
+import ca.uhn.fhir.rest.api.Constants;
 
 /**
  * 

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/BaseAndListParam.java

@@ -26,7 +26,7 @@ import java.util.List;
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.model.api.IQueryParameterAnd;
 import ca.uhn.fhir.model.api.IQueryParameterOr;
-import ca.uhn.fhir.rest.method.QualifiedParamList;
+import ca.uhn.fhir.rest.api.QualifiedParamList;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
 
 public abstract class BaseAndListParam<T extends IQueryParameterOr<?>> implements IQueryParameterAnd<T> {

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/BaseOrListParam.java

@@ -26,7 +26,7 @@ import java.util.List;
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.model.api.IQueryParameterOr;
 import ca.uhn.fhir.model.api.IQueryParameterType;
-import ca.uhn.fhir.rest.method.QualifiedParamList;
+import ca.uhn.fhir.rest.api.QualifiedParamList;
 
 abstract class BaseOrListParam<MT extends BaseOrListParam<?, ?>, PT extends IQueryParameterType> implements IQueryParameterOr<PT> {
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/BaseParam.java

@@ -25,7 +25,7 @@ import ca.uhn.fhir.context.FhirContext;
  */
 
 import ca.uhn.fhir.model.api.IQueryParameterType;
-import ca.uhn.fhir.rest.server.Constants;
+import ca.uhn.fhir.rest.api.Constants;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
 
 /**

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/BaseQueryParameter.java

@@ -23,22 +23,15 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank;
  */
 
 import java.lang.reflect.Method;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 import org.hl7.fhir.instance.model.api.IBaseResource;
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.rest.method.BaseMethodBinding;
+import ca.uhn.fhir.rest.api.QualifiedParamList;
-import ca.uhn.fhir.rest.method.IParameter;
+import ca.uhn.fhir.rest.api.RestSearchParameterTypeEnum;
-import ca.uhn.fhir.rest.method.QualifiedParamList;
+import ca.uhn.fhir.rest.api.server.IRequestDetails;
-import ca.uhn.fhir.rest.method.RequestDetails;
+import ca.uhn.fhir.rest.api.server.IServerMethodBinding;
-import ca.uhn.fhir.rest.method.RestSearchParameterTypeEnum;
-import ca.uhn.fhir.rest.method.SearchMethodBinding;
-import ca.uhn.fhir.rest.method.SearchMethodBinding.QualifierDetails;
 import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
 
@@ -81,8 +74,8 @@ public abstract class BaseQueryParameter implements IParameter {
 
 	public abstract Object parse(FhirContext theContext, List<QualifiedParamList> theString) throws InternalErrorException, InvalidRequestException;
 
-	private void parseParams(RequestDetails theRequest, List<QualifiedParamList> paramList, String theQualifiedParamName, String theQualifier) {
+	private void parseParams(IRequestDetails theRequest, List<QualifiedParamList> paramList, String theQualifiedParamName, String theQualifier) {
-		QualifierDetails qualifiers = SearchMethodBinding.extractQualifiersFromParameterName(theQualifier);
+		QualifierDetails qualifiers = QualifierDetails.extractQualifiersFromParameterName(theQualifier);
 		if (!qualifiers.passes(getQualifierWhitelist(), getQualifierBlacklist())) {
 			return;
 		}
@@ -132,7 +125,7 @@ public abstract class BaseQueryParameter implements IParameter {
 	}
 
 	@Override
-	public Object translateQueryParametersIntoServerArgument(RequestDetails theRequest, BaseMethodBinding<?> theMethodBinding) throws InternalErrorException, InvalidRequestException {
+	public Object translateQueryParametersIntoServerArgument(IRequestDetails theRequest, IServerMethodBinding theMethodBinding) throws InternalErrorException, InvalidRequestException {
 
 		List<QualifiedParamList> paramList = new ArrayList<QualifiedParamList>();
 		String name = getName();

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/DateParam.java

@@ -22,9 +22,7 @@ package ca.uhn.fhir.rest.param;
 
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
-import java.util.Collections;
+import java.util.*;
-import java.util.Date;
-import java.util.List;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -35,8 +33,7 @@ import ca.uhn.fhir.model.api.IQueryParameterOr;
 import ca.uhn.fhir.model.api.TemporalPrecisionEnum;
 import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum;
 import ca.uhn.fhir.model.primitive.*;
-import ca.uhn.fhir.rest.method.QualifiedParamList;
+import ca.uhn.fhir.rest.api.QualifiedParamList;
-import ca.uhn.fhir.rest.param.DateParam.DateParamDateTimeHolder;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
 import ca.uhn.fhir.util.ValidateUtil;
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/DateRangeParam.java

@@ -21,17 +21,14 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank;
  * limitations under the License.
  * #L%
  */
-
+import java.util.*;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
 
 import org.hl7.fhir.instance.model.api.IPrimitiveType;
 
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.model.api.IQueryParameterAnd;
 import ca.uhn.fhir.parser.DataFormatException;
-import ca.uhn.fhir.rest.method.QualifiedParamList;
+import ca.uhn.fhir.rest.api.QualifiedParamList;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
 
 public class DateRangeParam implements IQueryParameterAnd<DateParam> {

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/HasParam.java

@@ -24,7 +24,7 @@ import static org.apache.commons.lang3.StringUtils.defaultString;
 
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.model.api.IQueryParameterType;
-import ca.uhn.fhir.rest.server.Constants;
+import ca.uhn.fhir.rest.api.Constants;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
 
 /**
@@ -32,6 +32,8 @@ import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
  */
 public class HasParam extends BaseParam implements IQueryParameterType {
 
+	private static final long serialVersionUID = 1L;
+	
 	private String myOwningFieldName;
 	private String myParameterName;
 	private String myParameterValue;

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/IParameter.java

@@ -1,4 +1,4 @@
-package ca.uhn.fhir.rest.method;
+package ca.uhn.fhir.rest.param;
 
 /*
  * #%L
@@ -21,22 +21,19 @@ package ca.uhn.fhir.rest.method;
  */
 
 import java.lang.reflect.Method;
-import java.util.Collection;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
 
 import org.hl7.fhir.instance.model.api.IBaseResource;
 
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.model.api.IResource;
-import ca.uhn.fhir.rest.server.IResourceProvider;
+import ca.uhn.fhir.rest.api.server.IRequestDetails;
+import ca.uhn.fhir.rest.api.server.IServerMethodBinding;
 import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
 
 public interface IParameter {
 
-	void translateClientArgumentIntoQueryArgument(FhirContext theContext, Object theSourceClientArgument, Map<String, List<String>> theTargetQueryArguments, IBaseResource theTargetResource) throws InternalErrorException;
-
 	/**
 	 * This <b>server method</b> method takes the data received by the server in an incoming request, and translates that data into a single argument for a server method invocation. Note that all
 	 * received data is passed to this method, but the expectation is that not necessarily that all data is used by every parameter.
@@ -46,10 +43,13 @@ public interface IParameter {
 	 * @param theRequestContents
 	 *            The parsed contents of the incoming request. E.g. if the request was an HTTP POST with a resource in the body, this argument would contain the parsed {@link IResource} instance.
 	 * @param theMethodBinding TODO
-	 * @return Returns the argument object as it will be passed to the {@link IResourceProvider} method.
+	 * @return Returns the argument object as it will be passed to the IResourceProvider method.
 	 */
-	Object translateQueryParametersIntoServerArgument(RequestDetails theRequest, BaseMethodBinding<?> theMethodBinding) throws InternalErrorException, InvalidRequestException;
+	Object translateQueryParametersIntoServerArgument(IRequestDetails theRequest, IServerMethodBinding theMethodBinding) throws InternalErrorException, InvalidRequestException;
 
 	void initializeTypes(Method theMethod, Class<? extends Collection<?>> theOuterCollectionType, Class<? extends Collection<?>> theInnerCollectionType, Class<?> theParameterType);
 
+	void translateClientArgumentIntoQueryArgument(FhirContext theContext, Object theSourceClientArgument, Map<String, List<String>> theTargetQueryArguments, IBaseResource theTargetResource)
+			throws InternalErrorException;
+
 }

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/QualifierDetails.java

@@ -0,0 +1,130 @@
+package ca.uhn.fhir.rest.param;
+
+import java.util.Set;
+
+public class QualifierDetails {
+
+	private String myColonQualifier;
+	private String myDotQualifier;
+	private String myParamName;
+	private String myWholeQualifier;
+
+	public boolean passes(Set<String> theQualifierWhitelist, Set<String> theQualifierBlacklist) {
+		if (theQualifierWhitelist != null) {
+			if (!theQualifierWhitelist.contains(".*")) {
+				if (myDotQualifier != null) {
+					if (!theQualifierWhitelist.contains(myDotQualifier)) {
+						return false;
+					}
+				} else {
+					if (!theQualifierWhitelist.contains(".")) {
+						return false;
+					}
+				}
+			}
+			/*
+			 * This was removed Sep 9 2015, as I don't see any way it could possibly be triggered.
+			if (!theQualifierWhitelist.contains(SearchParameter.QUALIFIER_ANY_TYPE)) {
+				if (myColonQualifier != null) {
+					if (!theQualifierWhitelist.contains(myColonQualifier)) {
+						return false;
+					}
+				} else {
+					if (!theQualifierWhitelist.contains(":")) {
+						return false;
+					}
+				}
+			}
+			*/
+		}
+		if (theQualifierBlacklist != null) {
+			if (myDotQualifier != null) {
+				if (theQualifierBlacklist.contains(myDotQualifier)) {
+					return false;
+				}
+			}
+			if (myColonQualifier != null) {
+				if (theQualifierBlacklist.contains(myColonQualifier)) {
+					return false;
+				}
+			}
+		}
+
+		return true;
+	}
+
+	public void setParamName(String theParamName) {
+		myParamName = theParamName;
+	}
+
+	public String getParamName() {
+		return myParamName;
+	}
+
+	public void setColonQualifier(String theColonQualifier) {
+		myColonQualifier = theColonQualifier;
+	}
+
+	public void setDotQualifier(String theDotQualifier) {
+		myDotQualifier = theDotQualifier;
+	}
+
+	public String getWholeQualifier() {
+		return myWholeQualifier;
+	}
+
+	public void setWholeQualifier(String theWholeQualifier) {
+		myWholeQualifier = theWholeQualifier;
+	}
+
+	
+	public static QualifierDetails extractQualifiersFromParameterName(String theParamName) {
+		QualifierDetails retVal = new QualifierDetails();
+		if (theParamName == null || theParamName.length() == 0) {
+			return retVal;
+		}
+
+		int dotIdx = -1;
+		int colonIdx = -1;
+		for (int idx = 0; idx < theParamName.length(); idx++) {
+			char nextChar = theParamName.charAt(idx);
+			if (nextChar == '.' && dotIdx == -1) {
+				dotIdx = idx;
+			} else if (nextChar == ':' && colonIdx == -1) {
+				colonIdx = idx;
+			}
+		}
+
+		if (dotIdx != -1 && colonIdx != -1) {
+			if (dotIdx < colonIdx) {
+				retVal.setDotQualifier(theParamName.substring(dotIdx, colonIdx));
+				retVal.setColonQualifier(theParamName.substring(colonIdx));
+				retVal.setParamName(theParamName.substring(0, dotIdx));
+				retVal.setWholeQualifier(theParamName.substring(dotIdx));
+			} else {
+				retVal.setColonQualifier(theParamName.substring(colonIdx, dotIdx));
+				retVal.setDotQualifier(theParamName.substring(dotIdx));
+				retVal.setParamName(theParamName.substring(0, colonIdx));
+				retVal.setWholeQualifier(theParamName.substring(colonIdx));
+			}
+		} else if (dotIdx != -1) {
+			retVal.setDotQualifier(theParamName.substring(dotIdx));
+			retVal.setParamName(theParamName.substring(0, dotIdx));
+			retVal.setWholeQualifier(theParamName.substring(dotIdx));
+		} else if (colonIdx != -1) {
+			retVal.setColonQualifier(theParamName.substring(colonIdx));
+			retVal.setParamName(theParamName.substring(0, colonIdx));
+			retVal.setWholeQualifier(theParamName.substring(colonIdx));
+		} else {
+			retVal.setParamName(theParamName);
+			retVal.setColonQualifier(null);
+			retVal.setDotQualifier(null);
+			retVal.setWholeQualifier(null);
+		}
+
+		return retVal;
+	}
+
+
+	
+}

hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/StringParam.java

@@ -22,14 +22,12 @@ package ca.uhn.fhir.rest.param;
 import static org.apache.commons.lang3.StringUtils.defaultString;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.*;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.model.api.IQueryParameterType;
 import ca.uhn.fhir.model.primitive.StringDt;
-import ca.uhn.fhir.rest.server.Constants;
+import ca.uhn.fhir.rest.api.Constants;
 
 public class StringParam extends BaseParam implements IQueryParameterType {
 

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

@@ -1,6 +1,6 @@
 package ca.uhn.fhir.rest.server.exceptions;
 
-import ca.uhn.fhir.rest.server.Constants;
+import ca.uhn.fhir.rest.api.Constants;
 import ca.uhn.fhir.util.CoverageIgnore;
 
 /*

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

@@ -1,16 +1,11 @@
 package ca.uhn.fhir.rest.server.exceptions;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 import org.apache.commons.lang3.Validate;
 import org.hl7.fhir.instance.model.api.IBaseOperationOutcome;
 
-import ca.uhn.fhir.rest.server.IResourceProvider;
 
 /*
  * #%L
@@ -37,7 +32,7 @@ import ca.uhn.fhir.rest.server.IResourceProvider;
  * subclasses of this exception type.
  * <p>
  * HAPI provides a number of subclasses of BaseServerResponseException, and each one corresponds to a specific
- * HTTP status code. For example, if a {@link IResourceProvider resource provider} method throws 
+ * HTTP status code. For example, if a IResourceProvider method throws 
  * {@link ResourceNotFoundException}, this is a signal to the server that an <code>HTTP 404</code> should
  * be returned to the client.
  * </p>

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

@@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.server.exceptions;
 
 import org.hl7.fhir.instance.model.api.IBaseOperationOutcome;
 
-import ca.uhn.fhir.rest.server.Constants;
+import ca.uhn.fhir.rest.api.Constants;
 import ca.uhn.fhir.util.CoverageIgnore;
 
 /*

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

@@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.server.exceptions;
 
 import org.hl7.fhir.instance.model.api.IBaseOperationOutcome;
 
-import ca.uhn.fhir.rest.server.Constants;
+import ca.uhn.fhir.rest.api.Constants;
 import ca.uhn.fhir.util.CoverageIgnore;
 
 /*

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

@@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.server.exceptions;
 
 import org.hl7.fhir.instance.model.api.IBaseOperationOutcome;
 
-import ca.uhn.fhir.rest.server.Constants;
+import ca.uhn.fhir.rest.api.Constants;
 import ca.uhn.fhir.util.CoverageIgnore;
 
 /*

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

@@ -5,8 +5,8 @@ import java.util.Set;
 
 import org.hl7.fhir.instance.model.api.IBaseOperationOutcome;
 
+import ca.uhn.fhir.rest.api.Constants;
 import ca.uhn.fhir.rest.api.RequestTypeEnum;
-import ca.uhn.fhir.rest.server.Constants;
 
 /*
  * #%L

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

@@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.server.exceptions;
 
 import org.hl7.fhir.instance.model.api.IBaseOperationOutcome;
 
-import ca.uhn.fhir.rest.server.Constants;
+import ca.uhn.fhir.rest.api.Constants;
 import ca.uhn.fhir.util.CoverageIgnore;
 
 /*

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

@@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.server.exceptions;
 
 import org.hl7.fhir.instance.model.api.IBaseOperationOutcome;
 
-import ca.uhn.fhir.rest.server.Constants;
+import ca.uhn.fhir.rest.api.Constants;
 import ca.uhn.fhir.util.CoverageIgnore;
 
 /*

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

@@ -23,7 +23,7 @@ package ca.uhn.fhir.rest.server.exceptions;
 import org.hl7.fhir.instance.model.api.IBaseOperationOutcome;
 
 import ca.uhn.fhir.rest.annotation.Update;
-import ca.uhn.fhir.rest.server.Constants;
+import ca.uhn.fhir.rest.api.Constants;
 import ca.uhn.fhir.util.CoverageIgnore;
 
 /**

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

@@ -25,7 +25,7 @@ import org.hl7.fhir.instance.model.api.IIdType;
 
 import ca.uhn.fhir.model.api.IResource;
 import ca.uhn.fhir.model.base.composite.BaseIdentifierDt;
-import ca.uhn.fhir.rest.server.Constants;
+import ca.uhn.fhir.rest.api.Constants;
 import ca.uhn.fhir.util.CoverageIgnore;
 
 /**

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

@@ -26,7 +26,7 @@ import org.hl7.fhir.instance.model.api.IIdType;
 import ca.uhn.fhir.model.api.IResource;
 import ca.uhn.fhir.model.base.composite.BaseIdentifierDt;
 import ca.uhn.fhir.model.primitive.IdDt;
-import ca.uhn.fhir.rest.server.Constants;
+import ca.uhn.fhir.rest.api.Constants;
 import ca.uhn.fhir.util.CoverageIgnore;
 
 /**

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

@@ -24,7 +24,7 @@ import org.hl7.fhir.instance.model.api.IBaseOperationOutcome;
 
 import ca.uhn.fhir.rest.annotation.Delete;
 import ca.uhn.fhir.rest.annotation.Update;
-import ca.uhn.fhir.rest.server.Constants;
+import ca.uhn.fhir.rest.api.Constants;
 import ca.uhn.fhir.util.CoverageIgnore;
 
 /**

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

@@ -22,7 +22,7 @@ package ca.uhn.fhir.rest.server.exceptions;
 
 import org.hl7.fhir.instance.model.api.IBaseOperationOutcome;
 
-import ca.uhn.fhir.rest.server.Constants;
+import ca.uhn.fhir.rest.api.Constants;
 import ca.uhn.fhir.util.CoverageIgnore;
 
 /**

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

@@ -23,7 +23,7 @@ package ca.uhn.fhir.rest.server.exceptions;
 import org.hl7.fhir.instance.model.api.IBaseOperationOutcome;
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.rest.server.Constants;
+import ca.uhn.fhir.rest.api.Constants;
 import ca.uhn.fhir.util.CoverageIgnore;
 import ca.uhn.fhir.util.OperationOutcomeUtil;
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ReflectionUtil.java

@@ -19,13 +19,7 @@ package ca.uhn.fhir.util;
  * limitations under the License.
  * #L%
  */
-
+import java.lang.reflect.*;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.lang.reflect.TypeVariable;
-import java.lang.reflect.WildcardType;
 import java.util.LinkedHashSet;
 import java.util.List;
 
@@ -127,6 +121,20 @@ public class ReflectionUtil {
 		return type;
 	}
 
+	public static boolean isInstantiable(Class<?> theType) {
+		return !theType.isInterface() && !Modifier.isAbstract(theType.getModifiers());
+	}
+
+	public static <T> T newInstance(Class<T> theType, Class<?> theArgumentType, Object theArgument) {
+		Validate.notNull(theType, "theType must not be null");
+		try {
+			Constructor<T> constructor = theType.getConstructor(theArgumentType);
+			return constructor.newInstance(theArgument);
+		} catch (Exception e) {
+			throw new ConfigurationException("Failed to instantiate " + theType.getName(), e);
+		}
+	}
+
 	/**
 	 * Instantiate a class by no-arg constructor, throw {@link ConfigurationException} if we fail to do so
 	 */
@@ -156,8 +164,4 @@ public class ReflectionUtil {
 		}
 	}
 
-	public static boolean isInstantiable(Class<?> theType) {
-		return !theType.isInterface() && !Modifier.isAbstract(theType.getModifiers());
-	}
-
 }

hapi-fhir-base/src/main/java/ca/uhn/fhir/util/UrlUtil.java

@@ -4,19 +4,12 @@ import static org.apache.commons.lang3.StringUtils.defaultIfBlank;
 import static org.apache.commons.lang3.StringUtils.isBlank;
 
 import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
+import java.net.*;
-import java.net.URL;
+import java.util.*;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.Map.Entry;
-import java.util.StringTokenizer;
 
 import ca.uhn.fhir.model.primitive.IdDt;
-import ca.uhn.fhir.rest.server.Constants;
+import ca.uhn.fhir.rest.api.Constants;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
 
 /*

hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/IValidationContext.java

@@ -21,7 +21,7 @@ package ca.uhn.fhir.validation;
  */
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.rest.server.EncodingEnum;
+import ca.uhn.fhir.rest.api.EncodingEnum;
 
 public interface IValidationContext<T> {
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/SchemaBaseValidator.java

@@ -19,39 +19,25 @@ package ca.uhn.fhir.validation;
  * limitations under the License.
  * #L%
  */
-
+import java.io.*;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringReader;
 import java.nio.charset.Charset;
-import java.util.Collections;
+import java.util.*;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
 
 import javax.xml.XMLConstants;
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;
-import javax.xml.validation.Schema;
+import javax.xml.validation.*;
-import javax.xml.validation.SchemaFactory;
-import javax.xml.validation.Validator;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.input.BOMInputStream;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.w3c.dom.ls.LSInput;
 import org.w3c.dom.ls.LSResourceResolver;
-import org.xml.sax.SAXException;
+import org.xml.sax.*;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXParseException;
 
-import ca.uhn.fhir.context.ConfigurationException;
+import ca.uhn.fhir.context.*;
-import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.context.FhirVersionEnum;
 import ca.uhn.fhir.model.api.Bundle;
-import ca.uhn.fhir.rest.server.EncodingEnum;
+import ca.uhn.fhir.rest.api.EncodingEnum;
 import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
 
 public class SchemaBaseValidator implements IValidatorModule {

hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ValidationContext.java

@@ -27,8 +27,7 @@ import ca.uhn.fhir.model.api.Bundle;
 import ca.uhn.fhir.model.api.IResource;
 import ca.uhn.fhir.parser.IParser;
 import ca.uhn.fhir.parser.LenientErrorHandler;
-import ca.uhn.fhir.rest.method.MethodUtil;
+import ca.uhn.fhir.rest.api.EncodingEnum;
-import ca.uhn.fhir.rest.server.EncodingEnum;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
 import ca.uhn.fhir.util.ObjectUtil;
 
@@ -165,7 +164,7 @@ public class ValidationContext<T> extends BaseValidationContext<T> implements IV
 			@Override
 			public EncodingEnum getResourceAsStringEncoding() {
 				if (myEncoding == null) {
-					myEncoding = MethodUtil.detectEncodingNoDefault(theResourceBody);
+					myEncoding = EncodingEnum.detectEncodingNoDefault(theResourceBody);
 					if (myEncoding == null) {
 						throw new InvalidRequestException(theContext.getLocalizer().getMessage(ValidationContext.class, "unableToDetermineEncoding"));
 					}

hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/ValidationResult.java

@@ -28,7 +28,7 @@ import java.util.List;
 import org.hl7.fhir.instance.model.api.IBaseOperationOutcome;
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.rest.server.interceptor.ExceptionHandlingInterceptor;
+import ca.uhn.fhir.rest.api.Constants;
 import ca.uhn.fhir.util.OperationOutcomeUtil;
 
 /**
@@ -120,7 +120,7 @@ public class ValidationResult {
 				location = null;
 			}
 			String severity = next.getSeverity() != null ? next.getSeverity().getCode() : null;
-			OperationOutcomeUtil.addIssue(myCtx, theOperationOutcome, severity, next.getMessage(), location, ExceptionHandlingInterceptor.PROCESSING);
+			OperationOutcomeUtil.addIssue(myCtx, theOperationOutcome, severity, next.getMessage(), location, Constants.OO_INFOSTATUS_PROCESSING);
 		}
 
 		if (myMessages.isEmpty()) {

hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/schematron/SchematronBaseValidator.java

@@ -22,9 +22,7 @@ package ca.uhn.fhir.validation.schematron;
 
 import java.io.InputStream;
 import java.io.StringReader;
-import java.util.HashMap;
+import java.util.*;
-import java.util.Locale;
-import java.util.Map;
 
 import javax.xml.transform.stream.StreamSource;
 
@@ -41,15 +39,9 @@ import com.phloc.schematron.xslt.SchematronResourceSCH;
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.model.api.Bundle;
 import ca.uhn.fhir.model.api.BundleEntry;
-import ca.uhn.fhir.rest.server.EncodingEnum;
+import ca.uhn.fhir.rest.api.EncodingEnum;
 import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
-import ca.uhn.fhir.validation.FhirValidator;
+import ca.uhn.fhir.validation.*;
-import ca.uhn.fhir.validation.IValidationContext;
-import ca.uhn.fhir.validation.IValidatorModule;
-import ca.uhn.fhir.validation.ResultSeverityEnum;
-import ca.uhn.fhir.validation.SchemaBaseValidator;
-import ca.uhn.fhir.validation.SingleValidationMessage;
-import ca.uhn.fhir.validation.ValidationContext;
 
 /**
  * This class is only used using reflection from {@link SchematronProvider} in order

hapi-fhir-client/pom.xml

@@ -0,0 +1,211 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>ca.uhn.hapi.fhir</groupId>
+		<artifactId>hapi-deployable-pom</artifactId>
+		<version>2.6-SNAPSHOT</version>
+		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
+	</parent>
+
+	<artifactId>hapi-fhir-client</artifactId>
+	<packaging>jar</packaging>
+
+	<name>HAPI FHIR Client</name>
+
+	<dependencies>
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-base</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+			<exclusions>
+				<exclusion>
+					<artifactId>commons-logging</artifactId>
+					<groupId>commons-logging</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpcore</artifactId>
+		</dependency>
+
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<configuration>
+					<classFolders>
+						<classFolder>${basedir}/target/classes</classFolder>
+						<classFolder>${basedir}/../hapi-fhir-base/target/classes</classFolder>
+					</classFolders>
+					<sourceFolders>
+						<sourceFolder>${basedir}/src/main/java</sourceFolder>
+						<sourceFolder>${basedir}/../hapi-fhir-base/src/main/java</sourceFolder>
+					</sourceFolders>
+					<dumpOnExit>true</dumpOnExit>
+				</configuration>
+				<executions>
+					<execution>
+						<id>default-prepare-agent</id>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<argLine>${argLine} -Dfile.encoding=UTF-8 -Xmx712m</argLine>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>ca.uhn.hapi.fhir</groupId>
+				<artifactId>hapi-tinder-plugin</artifactId>
+				<version>${project.version}</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>generate-structures</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<package>ca.uhn.fhir.model.dstu</package>
+					<baseResourceNames>
+						<baseResourceName>adversereaction</baseResourceName>
+						<baseResourceName>alert</baseResourceName>
+						<baseResourceName>allergyintolerance</baseResourceName>
+						<baseResourceName>appointmentresponse</baseResourceName>
+						<baseResourceName>appointment</baseResourceName>
+						<baseResourceName>availability</baseResourceName>
+						<baseResourceName>careplan</baseResourceName>
+						<baseResourceName>claim</baseResourceName>
+						<baseResourceName>composition</baseResourceName>
+						<baseResourceName>conceptmap</baseResourceName>
+						<baseResourceName>condition</baseResourceName>
+						<baseResourceName>conformance</baseResourceName>
+						<baseResourceName>coverage</baseResourceName>
+						<baseResourceName>deviceobservationreport</baseResourceName>
+						<baseResourceName>device</baseResourceName>
+						<baseResourceName>diagnosticorder</baseResourceName>
+						<baseResourceName>diagnosticreport</baseResourceName>
+						<baseResourceName>documentmanifest</baseResourceName>
+						<baseResourceName>documentreference</baseResourceName>
+						<baseResourceName>encounter</baseResourceName>
+						<baseResourceName>familyhistory</baseResourceName>
+						<baseResourceName>geneexpression</baseResourceName>
+						<baseResourceName>geneticanalysis</baseResourceName>
+						<baseResourceName>group</baseResourceName>
+						<baseResourceName>gvfmeta</baseResourceName>
+						<baseResourceName>gvfvariant</baseResourceName>
+						<baseResourceName>imagingstudy</baseResourceName>
+						<baseResourceName>immunizationrecommendation</baseResourceName>
+						<baseResourceName>immunization</baseResourceName>
+						<baseResourceName>list</baseResourceName>
+						<baseResourceName>location</baseResourceName>
+						<baseResourceName>media</baseResourceName>
+						<baseResourceName>medicationadministration</baseResourceName>
+						<baseResourceName>medicationdispense</baseResourceName>
+						<baseResourceName>medicationprescription</baseResourceName>
+						<baseResourceName>medication</baseResourceName>
+						<baseResourceName>medicationstatement</baseResourceName>
+						<baseResourceName>messageheader</baseResourceName>
+						<baseResourceName>microarray</baseResourceName>
+						<baseResourceName>observation</baseResourceName>
+						<baseResourceName>operationoutcome</baseResourceName>
+						<baseResourceName>orderresponse</baseResourceName>
+						<baseResourceName>order</baseResourceName>
+						<baseResourceName>organization</baseResourceName>
+						<baseResourceName>other</baseResourceName>
+						<baseResourceName>patient</baseResourceName>
+						<baseResourceName>practitioner</baseResourceName>
+						<baseResourceName>procedure</baseResourceName>
+						<baseResourceName>profile</baseResourceName>
+						<baseResourceName>provenance</baseResourceName>
+						<baseResourceName>query</baseResourceName>
+						<baseResourceName>questionnaire</baseResourceName>
+						<baseResourceName>relatedperson</baseResourceName>
+						<baseResourceName>remittance</baseResourceName>
+						<baseResourceName>securityevent</baseResourceName>
+						<baseResourceName>sequencinganalysis</baseResourceName>
+						<baseResourceName>sequencinglab</baseResourceName>
+						<baseResourceName>slot</baseResourceName>
+						<baseResourceName>specimen</baseResourceName>
+						<baseResourceName>substance</baseResourceName>
+						<baseResourceName>supply</baseResourceName>
+						<baseResourceName>user</baseResourceName>
+						<baseResourceName>valueset</baseResourceName>
+					</baseResourceNames>
+					<buildDatatypes>true</buildDatatypes>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>add-source</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>add-source</goal>
+						</goals>
+						<configuration>
+							<sources>
+								<source>target/generated-sources/tinder</source>
+							</sources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+		<pluginManagement>
+			<plugins>
+				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself. -->
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>ca.uhn.hapi.fhir</groupId>
+										<artifactId>hapi-tinder-plugin</artifactId>
+										<versionRange>[0.4-SNAPSHOT,)</versionRange>
+										<goals>
+											<goal>generate-structures</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<resources>
+			<resource>
+				<directory>${basedir}/src/main/resources</directory>
+			</resource>
+			<resource>
+				<directory>${basedir}/target/generated-resources/tinder</directory>
+			</resource>
+		</resources>
+	</build>
+
+</project>

hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheRestfulClientFactory.java

@@ -36,9 +36,9 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.rest.api.RequestTypeEnum;
-import ca.uhn.fhir.rest.client.RestfulClientFactory;
 import ca.uhn.fhir.rest.client.api.Header;
 import ca.uhn.fhir.rest.client.api.IHttpClient;
+import ca.uhn.fhir.rest.client.impl.RestfulClientFactory;
 
 /**
  * A Restful Factory to create clients, requests and responses based on the Apache httpclient library.
@@ -120,7 +120,7 @@ public class ApacheRestfulClientFactory extends RestfulClientFactory {
 
 	/**
 	 * Only allows to set an instance of type org.apache.http.client.HttpClient
-	 * @see ca.uhn.fhir.rest.client.IRestfulClientFactory#setHttpClient(ca.uhn.fhir.rest.client.api.IHttpClient)
+	 * @see ca.uhn.fhir.rest.client.api.IRestfulClientFactory#setHttpClient(ca.uhn.fhir.rest.client.api.IHttpClient)
 	 */
 	@Override
 	public synchronized void setHttpClient(Object theHttpClient) {

hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/BaseHttpClient.java

@@ -27,8 +27,8 @@ import org.hl7.fhir.instance.model.api.IBaseBinary;
 
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.rest.api.RequestTypeEnum;
-import ca.uhn.fhir.rest.client.BaseHttpClientInvocation;
 import ca.uhn.fhir.rest.client.api.*;
+import ca.uhn.fhir.rest.client.impl.BaseHttpClientInvocation;
 import ca.uhn.fhir.rest.server.*;
 
 public abstract class BaseHttpClient implements IHttpClient {

hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/GZipContentInterceptor.java

@@ -29,9 +29,7 @@ import org.apache.http.HttpEntityEnclosingRequest;
 import org.apache.http.client.methods.HttpRequestBase;
 import org.apache.http.entity.ByteArrayEntity;
 
-import ca.uhn.fhir.rest.client.IClientInterceptor;
+import ca.uhn.fhir.rest.client.api.*;
-import ca.uhn.fhir.rest.client.api.IHttpRequest;
-import ca.uhn.fhir.rest.client.api.IHttpResponse;
 import ca.uhn.fhir.rest.server.Constants;
 
 /**

hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/BaseClient.java

@@ -1,4 +1,4 @@
-package ca.uhn.fhir.rest.client;
+package ca.uhn.fhir.rest.client.impl;
 
 /*
  * #%L
@@ -22,10 +22,7 @@ package ca.uhn.fhir.rest.client;
 
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
-import java.io.IOException;
+import java.io.*;
-import java.io.InputStream;
-import java.io.Reader;
-import java.io.StringReader;
 import java.util.*;
 
 import org.apache.commons.io.IOUtils;
@@ -36,20 +33,14 @@ import org.hl7.fhir.instance.model.api.*;
 import ca.uhn.fhir.context.*;
 import ca.uhn.fhir.parser.DataFormatException;
 import ca.uhn.fhir.parser.IParser;
-import ca.uhn.fhir.rest.api.SummaryEnum;
+import ca.uhn.fhir.rest.api.*;
-import ca.uhn.fhir.rest.client.api.IHttpClient;
+import ca.uhn.fhir.rest.client.*;
-import ca.uhn.fhir.rest.client.api.IHttpRequest;
+import ca.uhn.fhir.rest.client.api.*;
-import ca.uhn.fhir.rest.client.api.IHttpResponse;
+import ca.uhn.fhir.rest.client.exceptions.*;
-import ca.uhn.fhir.rest.client.api.IRestfulClient;
-import ca.uhn.fhir.rest.client.exceptions.FhirClientConnectionException;
-import ca.uhn.fhir.rest.client.exceptions.InvalidResponseException;
-import ca.uhn.fhir.rest.client.exceptions.NonFhirResponseException;
 import ca.uhn.fhir.rest.method.HttpGetClientInvocation;
 import ca.uhn.fhir.rest.method.IClientResponseHandler;
 import ca.uhn.fhir.rest.method.IClientResponseHandlerHandlesBinary;
 import ca.uhn.fhir.rest.method.MethodUtil;
-import ca.uhn.fhir.rest.server.Constants;
-import ca.uhn.fhir.rest.server.EncodingEnum;
 import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException;
 import ca.uhn.fhir.util.OperationOutcomeUtil;
 import ca.uhn.fhir.util.XmlUtil;

hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/BaseHttpClientInvocation.java

@@ -1,4 +1,4 @@
-package ca.uhn.fhir.rest.client;
+package ca.uhn.fhir.rest.client.impl;
 
 /*
  * #%L
@@ -29,9 +29,7 @@ import java.util.Map.Entry;
 
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.rest.api.RequestTypeEnum;
-import ca.uhn.fhir.rest.client.api.Header;
+import ca.uhn.fhir.rest.client.api.*;
-import ca.uhn.fhir.rest.client.api.IHttpClient;
-import ca.uhn.fhir.rest.client.api.IHttpRequest;
 import ca.uhn.fhir.rest.server.EncodingEnum;
 
 public abstract class BaseHttpClientInvocation {

hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/ClientInvocationHandler.java

@@ -1,4 +1,4 @@
-package ca.uhn.fhir.rest.client;
+package ca.uhn.fhir.rest.client.impl;
 
 /*
  * #%L
@@ -25,8 +25,8 @@ import java.lang.reflect.Method;
 import java.util.Map;
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.rest.client.ClientInvocationHandlerFactory.ILambda;
 import ca.uhn.fhir.rest.client.api.IHttpClient;
+import ca.uhn.fhir.rest.client.impl.ClientInvocationHandlerFactory.ILambda;
 import ca.uhn.fhir.rest.method.BaseMethodBinding;
 
 public class ClientInvocationHandler extends BaseClient implements InvocationHandler {

hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/ClientInvocationHandlerFactory.java

@@ -1,4 +1,4 @@
-package ca.uhn.fhir.rest.client;
+package ca.uhn.fhir.rest.client.impl;
 
 /*
  * #%L
@@ -29,8 +29,7 @@ import org.hl7.fhir.instance.model.api.IBaseResource;
 import ca.uhn.fhir.context.ConfigurationException;
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.rest.api.SummaryEnum;
-import ca.uhn.fhir.rest.client.api.IHttpClient;
+import ca.uhn.fhir.rest.client.api.*;
-import ca.uhn.fhir.rest.client.api.IRestfulClient;
 import ca.uhn.fhir.rest.method.BaseMethodBinding;
 import ca.uhn.fhir.rest.server.EncodingEnum;
 

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

@@ -1,4 +1,4 @@
-package ca.uhn.fhir.rest.client;
+package ca.uhn.fhir.rest.client.impl;
 
 /*
  * #%L
@@ -77,8 +77,7 @@ import ca.uhn.fhir.rest.api.PreferReturnEnum;
 import ca.uhn.fhir.rest.api.SortOrderEnum;
 import ca.uhn.fhir.rest.api.SortSpec;
 import ca.uhn.fhir.rest.api.SummaryEnum;
-import ca.uhn.fhir.rest.client.api.IHttpClient;
+import ca.uhn.fhir.rest.client.api.*;
-import ca.uhn.fhir.rest.client.api.IHttpRequest;
 import ca.uhn.fhir.rest.client.exceptions.NonFhirResponseException;
 import ca.uhn.fhir.rest.client.interceptor.LoggingInterceptor;
 import ca.uhn.fhir.rest.gclient.IClientExecutable;

hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/HttpBasicAuthInterceptor.java

@@ -1,4 +1,4 @@
-package ca.uhn.fhir.rest.client;
+package ca.uhn.fhir.rest.client.impl;
 
 import java.io.IOException;
 
@@ -12,7 +12,7 @@ import org.apache.http.client.protocol.HttpClientContext;
 import org.apache.http.impl.auth.BasicScheme;
 import org.apache.http.protocol.HttpContext;
 
-import ca.uhn.fhir.rest.client.api.IBasicClient;
+import ca.uhn.fhir.rest.client.api.*;
 
 /*
  * #%L

hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/RestfulClientFactory.java

@@ -1,4 +1,4 @@
-package ca.uhn.fhir.rest.client;
+package ca.uhn.fhir.rest.client.impl;
 
 /*
  * #%L
@@ -38,8 +38,8 @@ import ca.uhn.fhir.context.ConfigurationException;
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.context.FhirVersionEnum;
 import ca.uhn.fhir.parser.DataFormatException;
-import ca.uhn.fhir.rest.client.api.IHttpClient;
+import ca.uhn.fhir.rest.client.*;
-import ca.uhn.fhir.rest.client.api.IRestfulClient;
+import ca.uhn.fhir.rest.client.api.*;
 import ca.uhn.fhir.rest.client.exceptions.FhirClientConnectionException;
 import ca.uhn.fhir.rest.client.exceptions.FhirClientInappropriateForServerException;
 import ca.uhn.fhir.rest.method.BaseMethodBinding;

hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/BasicAuthInterceptor.java

@@ -26,9 +26,7 @@ import java.io.UnsupportedEncodingException;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
 
-import ca.uhn.fhir.rest.client.IClientInterceptor;
+import ca.uhn.fhir.rest.client.api.*;
-import ca.uhn.fhir.rest.client.api.IHttpRequest;
-import ca.uhn.fhir.rest.client.api.IHttpResponse;
 import ca.uhn.fhir.rest.server.Constants;
 import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
 

hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/BearerTokenAuthInterceptor.java

@@ -22,9 +22,7 @@ package ca.uhn.fhir.rest.client.interceptor;
 
 import org.apache.commons.lang3.Validate;
 
-import ca.uhn.fhir.rest.client.IClientInterceptor;
+import ca.uhn.fhir.rest.client.api.*;
-import ca.uhn.fhir.rest.client.api.IHttpRequest;
-import ca.uhn.fhir.rest.client.api.IHttpResponse;
 import ca.uhn.fhir.rest.server.Constants;
 import ca.uhn.fhir.util.CoverageIgnore;
 

hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/CapturingInterceptor.java

@@ -1,28 +1,6 @@
 package ca.uhn.fhir.rest.client.interceptor;
 
-/*
+import ca.uhn.fhir.rest.client.api.*;
- * #%L
- * HAPI FHIR - Core Library
- * %%
- * Copyright (C) 2014 - 2017 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-import ca.uhn.fhir.rest.client.IClientInterceptor;
-import ca.uhn.fhir.rest.client.api.IHttpRequest;
-import ca.uhn.fhir.rest.client.api.IHttpResponse;
 import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;

hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/CookieInterceptor.java

@@ -0,0 +1,30 @@
+package ca.uhn.fhir.rest.client.interceptor;
+
+import ca.uhn.fhir.rest.client.api.*;
+import ca.uhn.fhir.rest.server.Constants;
+
+/**
+ * HTTP interceptor to be used for adding Cookie to requests.
+ * <p>
+ * This interceptor adds a header resembling the following:<br>
+ * &nbsp;&nbsp;&nbsp;<code>Cookie: [key]=[value]</code><br>
+ * </p>
+ */
+
+public class CookieInterceptor implements IClientInterceptor {
+	private final String sessionCookie;
+
+	public CookieInterceptor(String sessionCookie) {
+		this.sessionCookie = sessionCookie;
+	}
+
+	@Override
+	public void interceptRequest(IHttpRequest theRequest) {
+		theRequest.addHeader(Constants.HEADER_COOKIE, sessionCookie); //$NON-NLS-1$
+	}
+
+	@Override
+	public void interceptResponse(IHttpResponse theResponse) {
+		// nothing
+	}
+}

hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/LoggingInterceptor.java

@@ -30,9 +30,7 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.Validate;
 import org.slf4j.Logger;
 
-import ca.uhn.fhir.rest.client.IClientInterceptor;
+import ca.uhn.fhir.rest.client.api.*;
-import ca.uhn.fhir.rest.client.api.IHttpRequest;
-import ca.uhn.fhir.rest.client.api.IHttpResponse;
 import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
 
 public class LoggingInterceptor implements IClientInterceptor {

hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/SimpleRequestHeaderInterceptor.java

@@ -28,9 +28,7 @@ import java.io.UnsupportedEncodingException;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
 
-import ca.uhn.fhir.rest.client.IClientInterceptor;
+import ca.uhn.fhir.rest.client.api.*;
-import ca.uhn.fhir.rest.client.api.IHttpRequest;
-import ca.uhn.fhir.rest.client.api.IHttpResponse;
 import ca.uhn.fhir.rest.server.Constants;
 import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
 

hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/interceptor/UserInfoInterceptor.java

@@ -22,9 +22,7 @@ package ca.uhn.fhir.rest.client.interceptor;
 
 import java.io.IOException;
 
-import ca.uhn.fhir.rest.client.IClientInterceptor;
+import ca.uhn.fhir.rest.client.api.*;
-import ca.uhn.fhir.rest.client.api.IHttpRequest;
-import ca.uhn.fhir.rest.client.api.IHttpResponse;
 
 /**
  * HTTP interceptor to be used for adding HTTP headers containing user identifying info for auditing purposes to the request

hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/AddTagsMethodBinding.java

@@ -1,4 +1,4 @@
-package ca.uhn.fhir.rest.method;
+package ca.uhn.fhir.rest.client.method;
 
 /*
  * #%L

hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/AtParameter.java

@@ -1,4 +1,4 @@
-package ca.uhn.fhir.rest.method;
+package ca.uhn.fhir.rest.client.method;
 
 /*
  * #%L

hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseAddOrDeleteTagsMethodBinding.java

@@ -1,4 +1,4 @@
-package ca.uhn.fhir.rest.method;
+package ca.uhn.fhir.rest.client.method;
 
 /*
  * #%L
@@ -38,7 +38,7 @@ import ca.uhn.fhir.rest.annotation.IdParam;
 import ca.uhn.fhir.rest.annotation.TagListParam;
 import ca.uhn.fhir.rest.api.RequestTypeEnum;
 import ca.uhn.fhir.rest.api.RestOperationTypeEnum;
-import ca.uhn.fhir.rest.client.BaseHttpClientInvocation;
+import ca.uhn.fhir.rest.client.impl.BaseHttpClientInvocation;
 import ca.uhn.fhir.rest.server.*;
 import ca.uhn.fhir.rest.server.exceptions.*;
 import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor;

hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseBinder.java

@@ -1,4 +1,4 @@
-package ca.uhn.fhir.rest.method;
+package ca.uhn.fhir.rest.client.method;
 
 /*
  * #%L