Remove dependency on cobertura at compile time

.gitignore

@@ -17,6 +17,7 @@ tmp.txt
 *.hprof
 tmp.txt
 ca.uhn.fhir.jpa.entity.ResourceIndexedSearchParamString/
+ca.uhn.fhir.jpa.entity.ResourceTable/
 
 # Vagrant stuff.
 .vagrant

hapi-fhir-android/pom.xml

@@ -56,12 +56,6 @@
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-android</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>net.sourceforge.cobertura</groupId>
-			<artifactId>cobertura</artifactId>
-			<version>2.1.1</version>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
@@ -142,8 +136,8 @@
 							<include>javax.xml.stream:stax-api</include>
 							<include>org.codehaus.woodstox:stax2-api</include>
 							<include>org.glassfish:javax.json</include>
-							<include>net.sourceforge.cobertura:cobertura</include>
 							<!--
+							<include>net.sourceforge.cobertura:cobertura</include>
 							<include>org.apache.commons:*</include>
 							<include>org.apache.httpcomponents:*</include>
 							<include>commons-codec:commons-codec</include>
@@ -162,13 +156,6 @@
 						</relocation>
 					</relocations>
 					<filters combine.children="append">
-						<!-- Make CoverageIgnore annotation available for android. -->
-						<filter>	
-							<artifact>net.sourceforge.cobertura:cobertura</artifact>
-							<includes>
-								<include>net/sourceforge/cobertura/CoverageIgnore*</include>
-							</includes>
-						</filter>
 						<!-- Exclude server side stuff, except exceptions which are used clientside -->
 						<filter>	
 							<artifact>ca.uhn.hapi.fhir:hapi-fhir-base</artifact>

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

@@ -26,11 +26,8 @@ import java.io.InputStream;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Field;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Proxy;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -54,7 +51,6 @@ import org.hl7.fhir.instance.model.api.IBaseDatatype;
 import org.hl7.fhir.instance.model.api.IBaseDatatypeElement;
 import org.hl7.fhir.instance.model.api.IBaseEnumeration;
 import org.hl7.fhir.instance.model.api.IBaseExtension;
-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.IBaseXhtml;

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

@@ -30,7 +30,6 @@ import java.util.Set;
 
 import org.apache.commons.lang3.StringUtils;
 import org.hl7.fhir.instance.model.api.IBase;
-import org.hl7.fhir.instance.model.api.IBaseDatatype;
 import org.hl7.fhir.instance.model.api.IBaseReference;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 

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

@@ -19,8 +19,7 @@ package ca.uhn.fhir.context;
  * limitations under the License.
  * #L%
  */
-
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
-import static org.apache.commons.lang3.StringUtils.*;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;

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

@@ -19,8 +19,7 @@ package ca.uhn.fhir.context;
  * limitations under the License.
  * #L%
  */
-
+import static org.apache.commons.lang3.StringUtils.isBlank;
-import static org.apache.commons.lang3.StringUtils.*;
 
 import java.util.Map;
 

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

@@ -27,7 +27,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.hl7.fhir.instance.model.api.IAnyResource;
 import org.hl7.fhir.instance.model.api.IBase;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 

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

@@ -19,8 +19,7 @@ package ca.uhn.fhir.model.api;
  * limitations under the License.
  * #L%
  */
-
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
-import static org.apache.commons.lang3.StringUtils.*;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -1,30 +1,5 @@
 package ca.uhn.fhir.model.api;
 
-/*
- * #%L
- * HAPI FHIR - Core Library
- * %%
- * Copyright (C) 2014 - 2015 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
 import ca.uhn.fhir.model.api.annotation.ResourceDef;
 import ca.uhn.fhir.model.base.composite.BaseContainedDt;
 import ca.uhn.fhir.model.base.composite.BaseNarrativeDt;

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

@@ -1,6 +1,6 @@
 package ca.uhn.fhir.model.api;
 
-import net.sourceforge.cobertura.CoverageIgnore;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 /*
  * #%L

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

@@ -19,8 +19,7 @@ package ca.uhn.fhir.model.api;
  * limitations under the License.
  * #L%
  */
-
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
-import static org.apache.commons.lang3.StringUtils.*;
 
 import java.net.URI;
 

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseCodingDt.java

@@ -21,7 +21,6 @@ package ca.uhn.fhir.model.base.composite;
  */
 
 import org.apache.commons.lang3.StringUtils;
-import org.hl7.fhir.instance.model.api.IBaseCoding;
 
 import ca.uhn.fhir.model.api.BaseIdentifiableElement;
 import ca.uhn.fhir.model.api.ICompositeDatatype;

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/QuantityCompararatorEnum.java

@@ -24,8 +24,8 @@ package ca.uhn.fhir.model.dstu.valueset;
 import java.util.HashMap;
 import java.util.Map;
 
-import net.sourceforge.cobertura.CoverageIgnore;
 import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 @CoverageIgnore
 public enum QuantityCompararatorEnum {

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventObjectSensitivityEnum.java

@@ -24,8 +24,8 @@ package ca.uhn.fhir.model.dstu.valueset;
 import java.util.HashMap;
 import java.util.Map;
 
-import net.sourceforge.cobertura.CoverageIgnore;
 import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 @CoverageIgnore
 public enum SecurityEventObjectSensitivityEnum {

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/valueset/SecurityEventObjectTypeEnum.java

@@ -24,8 +24,8 @@ package ca.uhn.fhir.model.dstu.valueset;
 import java.util.HashMap;
 import java.util.Map;
 
-import net.sourceforge.cobertura.CoverageIgnore;
 import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 @CoverageIgnore
 public enum SecurityEventObjectTypeEnum {

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

@@ -19,8 +19,11 @@ package ca.uhn.fhir.model.primitive;
  * limitations under the License.
  * #L%
  */
-
+import static ca.uhn.fhir.model.api.TemporalPrecisionEnum.DAY;
-import static ca.uhn.fhir.model.api.TemporalPrecisionEnum.*;
+import static ca.uhn.fhir.model.api.TemporalPrecisionEnum.MILLI;
+import static ca.uhn.fhir.model.api.TemporalPrecisionEnum.MONTH;
+import static ca.uhn.fhir.model.api.TemporalPrecisionEnum.SECOND;
+import static ca.uhn.fhir.model.api.TemporalPrecisionEnum.YEAR;
 
 import java.text.ParseException;
 import java.util.ArrayList;

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

@@ -19,8 +19,9 @@ package ca.uhn.fhir.model.primitive;
  * limitations under the License.
  * #L%
  */
+import static org.apache.commons.lang3.StringUtils.defaultString;
+import static org.apache.commons.lang3.StringUtils.isBlank;
 
-import static org.apache.commons.lang3.StringUtils.*;
 import ca.uhn.fhir.model.api.BasePrimitive;
 import ca.uhn.fhir.model.api.annotation.DatatypeDef;
 import ca.uhn.fhir.model.api.annotation.SimpleSetter;

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

@@ -19,8 +19,8 @@ package ca.uhn.fhir.model.primitive;
  * limitations under the License.
  * #L%
  */
-
+import static org.apache.commons.lang3.StringUtils.isBlank;
-import static org.apache.commons.lang3.StringUtils.*;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
 import java.math.BigDecimal;
 import java.util.UUID;

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

@@ -21,7 +21,7 @@ package ca.uhn.fhir.model.primitive;
  */
 
 import ca.uhn.fhir.model.api.annotation.DatatypeDef;
-import net.sourceforge.cobertura.CoverageIgnore;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 @DatatypeDef(name = "markdown", profileOf=StringDt.class)
 @CoverageIgnore

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

@@ -1,29 +1,9 @@
 package ca.uhn.fhir.model.primitive;
 
-/*
- * #%L
- * HAPI FHIR - Core Library
- * %%
- * Copyright (C) 2014 - 2015 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-import net.sourceforge.cobertura.CoverageIgnore;
 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.util.CoverageIgnore;
 
 @DatatypeDef(name = "positiveInt", profileOf=IntegerDt.class)
 @CoverageIgnore

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

@@ -1,29 +1,9 @@
 package ca.uhn.fhir.model.primitive;
 
-/*
- * #%L
- * HAPI FHIR - Core Library
- * %%
- * Copyright (C) 2014 - 2015 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-import net.sourceforge.cobertura.CoverageIgnore;
 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.util.CoverageIgnore;
 
 @DatatypeDef(name = "unsignedInt", profileOf=IntegerDt.class)
 @CoverageIgnore

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/valueset/BundleEntrySearchModeEnum.java

@@ -24,8 +24,8 @@ package ca.uhn.fhir.model.valueset;
 import java.util.HashMap;
 import java.util.Map;
 
-import net.sourceforge.cobertura.CoverageIgnore;
 import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 @CoverageIgnore
 public enum BundleEntrySearchModeEnum {

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/valueset/BundleEntryTransactionMethodEnum.java

@@ -24,8 +24,8 @@ package ca.uhn.fhir.model.valueset;
 import java.util.HashMap;
 import java.util.Map;
 
-import net.sourceforge.cobertura.CoverageIgnore;
 import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 /**
  * This Enum is only used to support using the DSTU1 Bundle structure (<code>ca.uhn.fhir.model.api.Bundle</code>)

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/valueset/BundleTypeEnum.java

@@ -24,8 +24,8 @@ package ca.uhn.fhir.model.valueset;
 import java.util.HashMap;
 import java.util.Map;
 
-import net.sourceforge.cobertura.CoverageIgnore;
 import ca.uhn.fhir.model.api.IValueSetEnumBinder;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 @CoverageIgnore
 public enum BundleTypeEnum {

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

@@ -19,8 +19,7 @@ package ca.uhn.fhir.narrative;
  * limitations under the License.
  * #L%
  */
-
+import static org.apache.commons.lang3.StringUtils.isBlank;
-import static org.apache.commons.lang3.StringUtils.*;
 
 import java.io.File;
 import java.io.FileInputStream;

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

@@ -50,7 +50,6 @@ import javax.json.stream.JsonGeneratorFactory;
 import javax.json.stream.JsonParsingException;
 
 import org.apache.commons.lang3.StringUtils;
-import org.hl7.fhir.instance.model.api.IAnyResource;
 import org.hl7.fhir.instance.model.api.IBase;
 import org.hl7.fhir.instance.model.api.IBaseBinary;
 import org.hl7.fhir.instance.model.api.IBaseBooleanDatatype;

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

@@ -19,8 +19,9 @@ package ca.uhn.fhir.parser;
  * limitations under the License.
  * #L%
  */
-
+import static org.apache.commons.lang3.StringUtils.defaultIfBlank;
-import static org.apache.commons.lang3.StringUtils.*;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
+import static org.apache.commons.lang3.StringUtils.isNotEmpty;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -28,7 +29,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.TreeSet;
 
 import javax.xml.stream.events.StartElement;
 import javax.xml.stream.events.XMLEvent;
@@ -39,7 +39,6 @@ import org.hl7.fhir.instance.model.api.IAnyResource;
 import org.hl7.fhir.instance.model.api.IBase;
 import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.instance.model.api.IBaseBinary;
-import org.hl7.fhir.instance.model.api.IBaseCoding;
 import org.hl7.fhir.instance.model.api.IBaseElement;
 import org.hl7.fhir.instance.model.api.IBaseExtension;
 import org.hl7.fhir.instance.model.api.IBaseHasExtensions;
@@ -77,7 +76,6 @@ 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.base.composite.BaseResourceReferenceDt;
 import ca.uhn.fhir.model.base.resource.ResourceMetadataMap;
 import ca.uhn.fhir.model.primitive.IdDt;

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

@@ -24,7 +24,7 @@ package ca.uhn.fhir.rest.api;
 import java.util.HashMap;
 import java.util.Map;
 
-import net.sourceforge.cobertura.CoverageIgnore;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 @CoverageIgnore
 public enum RestOperationTypeEnum {

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

@@ -59,7 +59,6 @@ import ca.uhn.fhir.context.BaseRuntimeElementCompositeDefinition;
 import ca.uhn.fhir.context.BaseRuntimeElementDefinition;
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.context.RuntimeResourceDefinition;
-import ca.uhn.fhir.model.base.resource.BaseOperationOutcome;
 import ca.uhn.fhir.parser.DataFormatException;
 import ca.uhn.fhir.parser.IParser;
 import ca.uhn.fhir.rest.api.SummaryEnum;

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

@@ -1,27 +1,7 @@
 package ca.uhn.fhir.rest.client.exceptions;
 
-/*
- * #%L
- * HAPI FHIR - Core Library
- * %%
- * Copyright (C) 2014 - 2015 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-import net.sourceforge.cobertura.CoverageIgnore;
 import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 /**
  * Represents a failure by the HAPI FHIR Client to successfully communicate

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

@@ -1,27 +1,7 @@
 package ca.uhn.fhir.rest.client.exceptions;
 
-/*
- * #%L
- * HAPI FHIR - Core Library
- * %%
- * Copyright (C) 2014 - 2015 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-import net.sourceforge.cobertura.CoverageIgnore;
 import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 /**
  * This exception will be thrown by FHIR clients if the client attempts to

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

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

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

@@ -19,17 +19,15 @@ package ca.uhn.fhir.rest.client.exceptions;
  * limitations under the License.
  * #L%
  */
-
+import static org.apache.commons.lang3.StringUtils.isBlank;
-import static org.apache.commons.lang3.StringUtils.*;
 
 import java.io.IOException;
 import java.io.Reader;
 
-import net.sourceforge.cobertura.CoverageIgnore;
-
 import org.apache.commons.io.IOUtils;
 
 import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 @CoverageIgnore
 public class NonFhirResponseException extends BaseServerResponseException {

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

@@ -26,7 +26,7 @@ import org.apache.http.client.methods.HttpRequestBase;
 
 import ca.uhn.fhir.rest.client.IClientInterceptor;
 import ca.uhn.fhir.rest.server.Constants;
-import net.sourceforge.cobertura.CoverageIgnore;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 /**
  * HTTP interceptor to be used for adding HTTP Authorization using "bearer tokens" to requests. Bearer tokens are used for protocols such as OAUTH2 (see the

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

@@ -19,8 +19,7 @@ package ca.uhn.fhir.rest.gclient;
  * limitations under the License.
  * #L%
  */
-
+import static org.apache.commons.lang3.StringUtils.defaultString;
-import static org.apache.commons.lang3.StringUtils.*;
 
 public class CompositeCriterion<A extends IParam, B extends IParam> implements ICompositeWithLeft<B>, ICriterion<B>, ICriterionInternal {
 

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

@@ -19,8 +19,8 @@ package ca.uhn.fhir.rest.gclient;
  * limitations under the License.
  * #L%
  */
+import static org.apache.commons.lang3.StringUtils.defaultString;
 
-import static org.apache.commons.lang3.StringUtils.*;
 import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum;
 import ca.uhn.fhir.rest.gclient.NumberClientParam.IMatches;
 

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

@@ -1,6 +1,6 @@
 package ca.uhn.fhir.rest.gclient;
 
-import static org.apache.commons.lang3.StringUtils.*;
+import static org.apache.commons.lang3.StringUtils.defaultString;
 
 import java.util.Arrays;
 import java.util.List;

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

@@ -21,15 +21,12 @@ package ca.uhn.fhir.rest.method;
  */
 
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.io.Reader;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletResponse;
-
 import org.hl7.fhir.instance.model.api.IBaseResource;
 
 import ca.uhn.fhir.context.ConfigurationException;
@@ -46,7 +43,6 @@ import ca.uhn.fhir.rest.client.BaseHttpClientInvocation;
 import ca.uhn.fhir.rest.server.Constants;
 import ca.uhn.fhir.rest.server.IResourceProvider;
 import ca.uhn.fhir.rest.server.IRestfulServer;
-import ca.uhn.fhir.rest.server.RestfulServer;
 import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException;
 import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;

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

@@ -48,7 +48,6 @@ import ca.uhn.fhir.rest.server.Constants;
 import ca.uhn.fhir.rest.server.EncodingEnum;
 import ca.uhn.fhir.rest.server.IVersionSpecificBundleFactory;
 import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
-import ca.uhn.fhir.util.UrlUtil;
 
 /**
  * @author James Agnew

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

@@ -19,7 +19,7 @@ package ca.uhn.fhir.rest.method;
  * limitations under the License.
  * #L%
  */
-import static org.apache.commons.lang3.StringUtils.*;
+import static org.apache.commons.lang3.StringUtils.isBlank;
 
 import java.io.IOException;
 import java.io.InputStream;

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

@@ -32,7 +32,6 @@ import ca.uhn.fhir.rest.api.RequestTypeEnum;
 import ca.uhn.fhir.rest.api.RestOperationTypeEnum;
 import ca.uhn.fhir.rest.server.IBundleProvider;
 import ca.uhn.fhir.rest.server.IRestfulServer;
-import ca.uhn.fhir.rest.server.RestfulServer;
 import ca.uhn.fhir.rest.server.SimpleBundleProvider;
 import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException;
 import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;

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

@@ -19,8 +19,7 @@ package ca.uhn.fhir.rest.method;
  * limitations under the License.
  * #L%
  */
-
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
-import static org.apache.commons.lang3.StringUtils.*;
 
 import java.lang.reflect.Method;
 import java.util.Collection;

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

@@ -38,7 +38,6 @@ import ca.uhn.fhir.model.valueset.BundleTypeEnum;
 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.method.BaseResourceReturningMethodBinding.ResourceOrDstu1Bundle;
 import ca.uhn.fhir.rest.server.Constants;
 import ca.uhn.fhir.rest.server.EncodingEnum;
 import ca.uhn.fhir.rest.server.IBundleProvider;
@@ -49,7 +48,7 @@ import ca.uhn.fhir.rest.server.RestfulServerUtils;
 import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
 import ca.uhn.fhir.rest.server.exceptions.ResourceGoneException;
-import net.sourceforge.cobertura.CoverageIgnore;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 public class PageMethodBinding extends BaseResourceReturningMethodBinding {
 

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

@@ -33,7 +33,6 @@ import java.util.Map;
 
 import org.hl7.fhir.instance.model.api.IIdType;
 
-import ca.uhn.fhir.model.primitive.IdDt;
 import ca.uhn.fhir.rest.api.RequestTypeEnum;
 import ca.uhn.fhir.rest.api.RestOperationTypeEnum;
 import ca.uhn.fhir.rest.server.IRestfulResponse;

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

@@ -19,8 +19,7 @@ package ca.uhn.fhir.rest.method;
  * limitations under the License.
  * #L%
  */
-
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
-import static org.apache.commons.lang3.StringUtils.*;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;

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

@@ -19,8 +19,7 @@ package ca.uhn.fhir.rest.method;
  * limitations under the License.
  * #L%
  */
-
+import static org.apache.commons.lang3.StringUtils.isBlank;
-import static org.apache.commons.lang3.StringUtils.*;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;

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

@@ -45,7 +45,6 @@ import ca.uhn.fhir.rest.param.TransactionParameter;
 import ca.uhn.fhir.rest.param.TransactionParameter.ParamStyle;
 import ca.uhn.fhir.rest.server.IBundleProvider;
 import ca.uhn.fhir.rest.server.IRestfulServer;
-import ca.uhn.fhir.rest.server.RestfulServer;
 import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
 

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

@@ -26,7 +26,6 @@ import java.util.List;
 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.method.RestSearchParameterTypeEnum;
 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/BaseQueryParameter.java

@@ -29,7 +29,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.lang3.StringUtils;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 
 import ca.uhn.fhir.context.FhirContext;

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

@@ -1,7 +1,7 @@
 package ca.uhn.fhir.rest.param;
 
 import ca.uhn.fhir.model.api.IQueryParameterType;
-import net.sourceforge.cobertura.CoverageIgnore;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 /*
  * #%L

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

@@ -1,7 +1,7 @@
 package ca.uhn.fhir.rest.param;
 
 import ca.uhn.fhir.model.api.IQueryParameterType;
-import net.sourceforge.cobertura.CoverageIgnore;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 /*
  * #%L

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

@@ -19,8 +19,7 @@ package ca.uhn.fhir.rest.param;
  * limitations under the License.
  * #L%
  */
-
+import static org.apache.commons.lang3.StringUtils.isBlank;
-import static org.apache.commons.lang3.StringUtils.*;
 
 import java.util.List;
 

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

@@ -1,6 +1,6 @@
 package ca.uhn.fhir.rest.param;
 
-import net.sourceforge.cobertura.CoverageIgnore;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 /*
  * #%L

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

@@ -1,6 +1,6 @@
 package ca.uhn.fhir.rest.param;
 
-import net.sourceforge.cobertura.CoverageIgnore;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 /*
  * #%L

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

@@ -32,7 +32,7 @@ import ca.uhn.fhir.model.primitive.BooleanDt;
 import ca.uhn.fhir.model.primitive.CodeDt;
 import ca.uhn.fhir.model.primitive.StringDt;
 import ca.uhn.fhir.model.primitive.UriDt;
-import net.sourceforge.cobertura.CoverageIgnore;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 @CoverageIgnore
 public class InternalCodingDt extends BaseCodingDt implements ICompositeDatatype {

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

@@ -1,6 +1,6 @@
 package ca.uhn.fhir.rest.param;
 
-import net.sourceforge.cobertura.CoverageIgnore;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 /*
  * #%L

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

@@ -1,6 +1,6 @@
 package ca.uhn.fhir.rest.param;
 
-import net.sourceforge.cobertura.CoverageIgnore;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 /*
  * #%L

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

@@ -19,8 +19,7 @@ package ca.uhn.fhir.rest.param;
  * limitations under the License.
  * #L%
  */
-
+import static org.apache.commons.lang3.StringUtils.isBlank;
-import static org.apache.commons.lang3.StringUtils.*;
 
 import java.math.BigDecimal;
 

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

@@ -23,7 +23,7 @@ package ca.uhn.fhir.rest.param;
 import java.util.Date;
 
 import ca.uhn.fhir.model.dstu.valueset.QuantityCompararatorEnum;
-import net.sourceforge.cobertura.CoverageIgnore;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 /**
  * @deprecated Use {@link DateParam} instead (this class is identical, but was renamed to be less confusing)

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

@@ -1,6 +1,6 @@
 package ca.uhn.fhir.rest.param;
 
-import net.sourceforge.cobertura.CoverageIgnore;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 /*
  * #%L

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

@@ -1,6 +1,6 @@
 package ca.uhn.fhir.rest.param;
 
-import net.sourceforge.cobertura.CoverageIgnore;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 /*
  * #%L

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

@@ -19,9 +19,8 @@ package ca.uhn.fhir.rest.param;
  * limitations under the License.
  * #L%
  */
-
+import static ca.uhn.fhir.rest.param.ParameterUtil.escape;
-import static ca.uhn.fhir.rest.param.ParameterUtil.*;
+import static org.apache.commons.lang3.StringUtils.defaultString;
-import static org.apache.commons.lang3.StringUtils.*;
 
 import java.math.BigDecimal;
 import java.util.List;

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

@@ -1,6 +1,6 @@
 package ca.uhn.fhir.rest.param;
 
-import net.sourceforge.cobertura.CoverageIgnore;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 /*
  * #%L

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

@@ -1,6 +1,6 @@
 package ca.uhn.fhir.rest.param;
 
-import net.sourceforge.cobertura.CoverageIgnore;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 /*
  * #%L

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

@@ -19,8 +19,8 @@ package ca.uhn.fhir.rest.param;
  * limitations under the License.
  * #L%
  */
-
+import static org.apache.commons.lang3.StringUtils.isBlank;
-import static org.apache.commons.lang3.StringUtils.*;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

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

@@ -19,8 +19,8 @@ package ca.uhn.fhir.rest.param;
  * limitations under the License.
  * #L%
  */
-
+import static org.apache.commons.lang3.StringUtils.isBlank;
-import static org.apache.commons.lang3.StringUtils.*;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

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

@@ -1,7 +1,6 @@
 package ca.uhn.fhir.rest.param;
 
-import ca.uhn.fhir.rest.method.RestSearchParameterTypeEnum;
+import ca.uhn.fhir.util.CoverageIgnore;
-import net.sourceforge.cobertura.CoverageIgnore;
 
 /*
  * #%L

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

@@ -1,6 +1,6 @@
 package ca.uhn.fhir.rest.param;
 
-import net.sourceforge.cobertura.CoverageIgnore;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 /*
  * #%L

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

@@ -1,7 +1,6 @@
 package ca.uhn.fhir.rest.param;
 
-import ca.uhn.fhir.rest.method.RestSearchParameterTypeEnum;
+import ca.uhn.fhir.util.CoverageIgnore;
-import net.sourceforge.cobertura.CoverageIgnore;
 
 /*
  * #%L

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

@@ -5,7 +5,7 @@ import java.util.List;
 
 import ca.uhn.fhir.model.base.composite.BaseCodingDt;
 import ca.uhn.fhir.model.base.composite.BaseIdentifierDt;
-import net.sourceforge.cobertura.CoverageIgnore;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 /*
  * #%L

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

@@ -19,8 +19,8 @@ package ca.uhn.fhir.rest.param;
  * limitations under the License.
  * #L%
  */
-
+import static org.apache.commons.lang3.StringUtils.defaultString;
-import static org.apache.commons.lang3.StringUtils.*;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.builder.ToStringBuilder;

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

@@ -1,6 +1,6 @@
 package ca.uhn.fhir.rest.param;
 
-import net.sourceforge.cobertura.CoverageIgnore;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 /*
  * #%L

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

@@ -1,6 +1,6 @@
 package ca.uhn.fhir.rest.param;
 
-import net.sourceforge.cobertura.CoverageIgnore;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 /*
  * #%L

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

@@ -19,8 +19,7 @@ package ca.uhn.fhir.rest.param;
  * limitations under the License.
  * #L%
  */
-
+import static org.apache.commons.lang3.StringUtils.defaultString;
-import static org.apache.commons.lang3.StringUtils.*;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.builder.ToStringBuilder;

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

@@ -1,7 +1,7 @@
 package ca.uhn.fhir.rest.server.exceptions;
 
-import net.sourceforge.cobertura.CoverageIgnore;
 import ca.uhn.fhir.rest.server.Constants;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 /*
  * #%L

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

@@ -1,10 +1,9 @@
 package ca.uhn.fhir.rest.server.exceptions;
 
-import net.sourceforge.cobertura.CoverageIgnore;
-
 import org.hl7.fhir.instance.model.api.IBaseOperationOutcome;
 
 import ca.uhn.fhir.rest.server.Constants;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 /*
  * #%L

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

@@ -1,10 +1,9 @@
 package ca.uhn.fhir.rest.server.exceptions;
 
-import net.sourceforge.cobertura.CoverageIgnore;
-
 import org.hl7.fhir.instance.model.api.IBaseOperationOutcome;
 
 import ca.uhn.fhir.rest.server.Constants;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 /*
  * #%L

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

@@ -1,10 +1,9 @@
 package ca.uhn.fhir.rest.server.exceptions;
 
-import net.sourceforge.cobertura.CoverageIgnore;
-
 import org.hl7.fhir.instance.model.api.IBaseOperationOutcome;
 
 import ca.uhn.fhir.rest.server.Constants;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 /*
  * #%L

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

@@ -1,10 +1,9 @@
 package ca.uhn.fhir.rest.server.exceptions;
 
-import net.sourceforge.cobertura.CoverageIgnore;
-
 import org.hl7.fhir.instance.model.api.IBaseOperationOutcome;
 
 import ca.uhn.fhir.rest.server.Constants;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 /*
  * #%L

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

@@ -1,10 +1,9 @@
 package ca.uhn.fhir.rest.server.exceptions;
 
-import net.sourceforge.cobertura.CoverageIgnore;
-
 import org.hl7.fhir.instance.model.api.IBaseOperationOutcome;
 
 import ca.uhn.fhir.rest.server.Constants;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 /*
  * #%L

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

@@ -1,31 +1,10 @@
 package ca.uhn.fhir.rest.server.exceptions;
 
-/*
- * #%L
- * HAPI FHIR - Core Library
- * %%
- * Copyright (C) 2014 - 2015 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-import net.sourceforge.cobertura.CoverageIgnore;
-
 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.util.CoverageIgnore;
 
 /**
  * Represents an <b>HTTP 412 Precondition Failed</b> response. This exception

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

@@ -1,33 +1,12 @@
 package ca.uhn.fhir.rest.server.exceptions;
 
-/*
- * #%L
- * HAPI FHIR - Core Library
- * %%
- * Copyright (C) 2014 - 2015 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-import net.sourceforge.cobertura.CoverageIgnore;
-
 import org.hl7.fhir.instance.model.api.IBaseOperationOutcome;
 
 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.util.CoverageIgnore;
 
 /**
  * Represents an <b>HTTP 410 Resource Gone</b> response, which geenerally

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

@@ -1,27 +1,5 @@
 package ca.uhn.fhir.rest.server.exceptions;
 
-/*
- * #%L
- * HAPI FHIR - Core Library
- * %%
- * Copyright (C) 2014 - 2015 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-import net.sourceforge.cobertura.CoverageIgnore;
-
 import org.hl7.fhir.instance.model.api.IBaseOperationOutcome;
 import org.hl7.fhir.instance.model.api.IIdType;
 
@@ -29,6 +7,7 @@ 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.util.CoverageIgnore;
 
 /**
  * Represents an <b>HTTP 404 Resource Not Found</b> response, which means that the request is pointing to a resource that does not exist.

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

@@ -1,32 +1,11 @@
 package ca.uhn.fhir.rest.server.exceptions;
 
-/*
- * #%L
- * HAPI FHIR - Core Library
- * %%
- * Copyright (C) 2014 - 2015 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-import net.sourceforge.cobertura.CoverageIgnore;
-
 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.util.CoverageIgnore;
 
 /**
  * Represents an <b>HTTP 409 Conflict</b> response. This exception should be 

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

@@ -1,30 +1,9 @@
 package ca.uhn.fhir.rest.server.exceptions;
 
-/*
- * #%L
- * HAPI FHIR - Core Library
- * %%
- * Copyright (C) 2014 - 2015 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-import net.sourceforge.cobertura.CoverageIgnore;
-
 import org.hl7.fhir.instance.model.api.IBaseOperationOutcome;
 
 import ca.uhn.fhir.rest.server.Constants;
+import ca.uhn.fhir.util.CoverageIgnore;
 
 /**
  * @deprecated Use {@link PreconditionFailedException} instead - This exception is

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

@@ -1,9 +1,9 @@
 package ca.uhn.fhir.rest.server.exceptions;
 
-import net.sourceforge.cobertura.CoverageIgnore;
-
 import org.hl7.fhir.instance.model.api.IBaseOperationOutcome;
 
+import ca.uhn.fhir.util.CoverageIgnore;
+
 /*
  * #%L
  * HAPI FHIR - Core Library

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

@@ -1,31 +1,10 @@
 package ca.uhn.fhir.rest.server.exceptions;
 
-/*
- * #%L
- * HAPI FHIR - Core Library
- * %%
- * Copyright (C) 2014 - 2015 University Health Network
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
- */
-
-import net.sourceforge.cobertura.CoverageIgnore;
-
 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.util.CoverageIgnore;
 import ca.uhn.fhir.util.OperationOutcomeUtil;
 
 /**

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

@@ -1,7 +1,6 @@
 package ca.uhn.fhir.rest.server.servlet;
 
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 
 /*
  * #%L
@@ -33,13 +32,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.tools.ant.taskdefs.GUnzip;
 
 import ca.uhn.fhir.context.ConfigurationException;
 import ca.uhn.fhir.rest.api.RequestTypeEnum;

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

@@ -0,0 +1,5 @@
+package ca.uhn.fhir.util;
+
+public @interface CoverageIgnore {
+	// nothing
+}

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

@@ -35,7 +35,6 @@ import org.hl7.fhir.instance.model.api.IBaseHasExtensions;
 import org.hl7.fhir.instance.model.api.IBaseHasModifierExtensions;
 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.IPrimitiveType;
 
 import ca.uhn.fhir.context.BaseRuntimeChildDefinition;

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

@@ -23,7 +23,6 @@ package ca.uhn.fhir.util;
 import java.util.List;
 
 import org.hl7.fhir.instance.model.api.IBase;
-import org.hl7.fhir.instance.model.api.IBaseExtension;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 
 import ca.uhn.fhir.context.BaseRuntimeChildDefinition;

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

@@ -19,8 +19,7 @@ package ca.uhn.fhir.util;
  * limitations under the License.
  * #L%
  */
-
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
-import static org.apache.commons.lang3.StringUtils.*;
 
 import java.util.List;
 

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

@@ -31,7 +31,6 @@ import org.hl7.fhir.instance.model.api.IPrimitiveType;
 import ca.uhn.fhir.context.BaseRuntimeChildDefinition;
 import ca.uhn.fhir.context.BaseRuntimeElementCompositeDefinition;
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.context.FhirVersionEnum;
 import ca.uhn.fhir.context.RuntimeResourceDefinition;
 import ca.uhn.fhir.model.primitive.StringDt;
 

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

@@ -32,6 +32,12 @@ import org.apache.commons.io.IOUtils;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.oclc.purl.dsdl.svrl.SchematronOutputType;
 
+import com.phloc.commons.error.IResourceError;
+import com.phloc.commons.error.IResourceErrorGroup;
+import com.phloc.schematron.ISchematronResource;
+import com.phloc.schematron.SchematronHelper;
+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;
@@ -45,12 +51,6 @@ import ca.uhn.fhir.validation.SchemaBaseValidator;
 import ca.uhn.fhir.validation.SingleValidationMessage;
 import ca.uhn.fhir.validation.ValidationContext;
 
-import com.phloc.commons.error.IResourceError;
-import com.phloc.commons.error.IResourceErrorGroup;
-import com.phloc.schematron.ISchematronResource;
-import com.phloc.schematron.SchematronHelper;
-import com.phloc.schematron.xslt.SchematronResourceSCH;
-
 /**
  * This class is only used using reflection from {@link SchematronProvider} in order
  * to be truly optional.

hapi-fhir-cobertura/pom.xml

@@ -208,6 +208,7 @@
 								<ignore>**/valueset/*.class</ignore>
 								<ignore>**/exceptions/*.class</ignore>
 							</excludes>
+							<ignoreMethodAnnotation>ca.uhn.fhir.util.CoverageIgnore</ignoreMethodAnnotation>
 							<!-- <ignoreMethodAnnotations> <ignoreMethodAnnotation>net.sourceforge.cobertura.CoverageIgnore</ignoreMethodAnnotation> </ignoreMethodAnnotations> -->
 						</instrumentation>
 					</configuration>

hapi-fhir-jaxrsserver-base/pom.xml

@@ -43,6 +43,11 @@
 			<artifactId>ejb-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
 
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>

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

@@ -53,9 +53,9 @@ import org.apache.commons.lang3.NotImplementedException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.utils.URLEncodedUtils;
+import org.hl7.fhir.dstu21.model.Bundle.HTTPVerb;
 import org.hl7.fhir.dstu21.model.IdType;
 import org.hl7.fhir.dstu21.model.StringType;
-import org.hl7.fhir.dstu21.model.Bundle.HTTPVerb;
 import org.hl7.fhir.instance.model.api.IAnyResource;
 import org.hl7.fhir.instance.model.api.IBaseCoding;
 import org.hl7.fhir.instance.model.api.IBaseOperationOutcome;
@@ -139,9 +139,9 @@ import ca.uhn.fhir.rest.server.exceptions.ResourceVersionConflictException;
 import ca.uhn.fhir.rest.server.exceptions.UnprocessableEntityException;
 import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor;
 import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor.ActionRequestDetails;
+import ca.uhn.fhir.util.CoverageIgnore;
 import ca.uhn.fhir.util.FhirTerser;
 import ca.uhn.fhir.util.OperationOutcomeUtil;
-import net.sourceforge.cobertura.CoverageIgnore;
 
 public abstract class BaseHapiFhirDao<T extends IBaseResource> implements IDao {
 

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

@@ -27,7 +27,6 @@ import org.hl7.fhir.instance.model.api.IBaseResource;
 
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.context.RuntimeResourceDefinition;
-import ca.uhn.fhir.model.api.IResource;
 import ca.uhn.fhir.util.FhirTerser;
 
 public class BaseSearchParamExtractor {

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

@@ -56,12 +56,12 @@ import ca.uhn.fhir.rest.server.EncodingEnum;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
 import ca.uhn.fhir.rest.server.exceptions.PreconditionFailedException;
 import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor.ActionRequestDetails;
+import ca.uhn.fhir.util.CoverageIgnore;
 import ca.uhn.fhir.util.FhirTerser;
 import ca.uhn.fhir.validation.FhirValidator;
 import ca.uhn.fhir.validation.IValidationContext;
 import ca.uhn.fhir.validation.IValidatorModule;
 import ca.uhn.fhir.validation.ValidationResult;
-import net.sourceforge.cobertura.CoverageIgnore;
 
 public class FhirResourceDaoDstu2<T extends IResource> extends BaseHapiFhirResourceDao<T> {
 

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

@@ -54,12 +54,12 @@ import ca.uhn.fhir.rest.server.EncodingEnum;
 import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
 import ca.uhn.fhir.rest.server.exceptions.PreconditionFailedException;
 import ca.uhn.fhir.rest.server.interceptor.IServerInterceptor.ActionRequestDetails;
+import ca.uhn.fhir.util.CoverageIgnore;
 import ca.uhn.fhir.util.FhirTerser;
 import ca.uhn.fhir.validation.FhirValidator;
 import ca.uhn.fhir.validation.IValidationContext;
 import ca.uhn.fhir.validation.IValidatorModule;
 import ca.uhn.fhir.validation.ValidationResult;
-import net.sourceforge.cobertura.CoverageIgnore;
 
 public class FhirResourceDaoDstu21<T extends IAnyResource> extends BaseHapiFhirResourceDao<T> {