From 9fe80dfee1e3d158a7c7a2525c34460372c604ac Mon Sep 17 00:00:00 2001 From: James Agnew Date: Thu, 13 Nov 2014 15:53:52 -0500 Subject: [PATCH] Cleanup some unused files and warnings --- hapi-fhir-base/examples/pom.xml.orig | 55 ---- .../BaseRuntimeDeclaredChildDefinition.java | 1 - .../context/RuntimeResourceDefinition.java | 2 - .../base/composite/BaseIdentifierDt.java | 1 - .../ca/uhn/fhir/model/primitive/XhtmlDt.java | 7 - .../ca/uhn/fhir/rest/annotation/Destroy.java | 5 +- .../rest/method/ConformanceMethodBinding.java | 1 - .../uhn/fhir/rest/param/BaseOrListParam.java | 3 - .../BaseServerResponseException.java.orig | 301 ------------------ .../UnprocessableEntityException.java | 9 - .../UnprocessableEntityException.java.orig | 87 ----- .../ca/uhn/fhir/validation/FhirValidator.java | 4 - hapi-fhir-oauth2/pom.xml | 1 + 13 files changed, 3 insertions(+), 474 deletions(-) delete mode 100644 hapi-fhir-base/examples/pom.xml.orig delete mode 100644 hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/BaseServerResponseException.java.orig delete mode 100644 hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/UnprocessableEntityException.java.orig diff --git a/hapi-fhir-base/examples/pom.xml.orig b/hapi-fhir-base/examples/pom.xml.orig deleted file mode 100644 index 09ea3151fb1..00000000000 --- a/hapi-fhir-base/examples/pom.xml.orig +++ /dev/null @@ -1,55 +0,0 @@ - - 4.0.0 - - - ca.uhn.hapi.fhir - hapi-fhir - 0.8-SNAPSHOT - ../../pom.xml - - - hapi-fhir-base-examples - jar - - HAPI FHIR - Examples (for site) - - - - ca.uhn.hapi.fhir - hapi-fhir-base - 0.8-SNAPSHOT -<<<<<<< HEAD -======= - - - ca.uhn.hapi.fhir - hapi-fhir-structures-dstu - 0.8-SNAPSHOT ->>>>>>> versions - - - javax.servlet - javax.servlet-api - 3.1.0 - provided - - - junit - junit - ${junit_version} - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - - - diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeDeclaredChildDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeDeclaredChildDefinition.java index 649e2408c15..799f2f1944a 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeDeclaredChildDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeDeclaredChildDefinition.java @@ -237,7 +237,6 @@ public abstract class BaseRuntimeDeclaredChildDefinition extends BaseRuntimeChil @SuppressWarnings("unchecked") @Override public List getValues(Object theTarget) { - @SuppressWarnings("unchecked") List retVal; try { retVal = (List) myField.get(theTarget); diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeResourceDefinition.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeResourceDefinition.java index a3e08640339..f357bd32f97 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeResourceDefinition.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/RuntimeResourceDefinition.java @@ -23,7 +23,6 @@ package ca.uhn.fhir.context; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -34,7 +33,6 @@ import ca.uhn.fhir.model.api.annotation.ResourceDef; public class RuntimeResourceDefinition extends BaseRuntimeElementCompositeDefinition { - private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(RuntimeResourceDefinition.class); private RuntimeResourceDefinition myBaseDefinition; private Map myNameToSearchParam = new LinkedHashMap(); private IResource myProfileDef; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseIdentifierDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseIdentifierDt.java index 32647771722..0c1441421de 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseIdentifierDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/base/composite/BaseIdentifierDt.java @@ -23,7 +23,6 @@ package ca.uhn.fhir.model.base.composite; import org.apache.commons.lang3.StringUtils; import ca.uhn.fhir.model.api.BaseIdentifiableElement; -import ca.uhn.fhir.model.api.BasePrimitive; import ca.uhn.fhir.model.api.ICompositeDatatype; import ca.uhn.fhir.model.api.IQueryParameterType; import ca.uhn.fhir.model.primitive.StringDt; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/XhtmlDt.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/XhtmlDt.java index 1e90bc218c9..f6eec435eec 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/XhtmlDt.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/primitive/XhtmlDt.java @@ -20,12 +20,8 @@ package ca.uhn.fhir.model.primitive; * #L% */ -import java.io.IOException; -import java.io.OutputStream; import java.io.StringReader; import java.io.StringWriter; -import java.io.UnsupportedEncodingException; -import java.io.Writer; import java.util.ArrayList; import java.util.List; @@ -35,9 +31,6 @@ import javax.xml.stream.XMLEventWriter; import javax.xml.stream.XMLStreamException; import javax.xml.stream.events.XMLEvent; -import org.apache.commons.lang3.StringEscapeUtils; -import org.codehaus.stax2.io.EscapingWriterFactory; - import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.model.api.BasePrimitive; import ca.uhn.fhir.model.api.annotation.DatatypeDef; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Destroy.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Destroy.java index 52c6595d901..8cf3c5bb050 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Destroy.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/annotation/Destroy.java @@ -11,13 +11,12 @@ import java.lang.annotation.Target; * %% * Copyright (C) 2014 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. diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/ConformanceMethodBinding.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/ConformanceMethodBinding.java index 9ede1e02798..01ce3d19dce 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/ConformanceMethodBinding.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/method/ConformanceMethodBinding.java @@ -21,7 +21,6 @@ package ca.uhn.fhir.rest.method; */ import java.lang.reflect.Method; -import java.lang.reflect.Modifier; import ca.uhn.fhir.context.ConfigurationException; import ca.uhn.fhir.context.FhirContext; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/BaseOrListParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/BaseOrListParam.java index 3c31bbb2a73..bfe53f9136c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/BaseOrListParam.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/BaseOrListParam.java @@ -23,9 +23,6 @@ package ca.uhn.fhir.rest.param; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang3.Validate; - -import ca.uhn.fhir.model.api.IQueryParameterAnd; import ca.uhn.fhir.model.api.IQueryParameterOr; import ca.uhn.fhir.model.api.IQueryParameterType; import ca.uhn.fhir.rest.method.QualifiedParamList; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/BaseServerResponseException.java.orig b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/BaseServerResponseException.java.orig deleted file mode 100644 index 20642132173..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/BaseServerResponseException.java.orig +++ /dev/null @@ -1,301 +0,0 @@ -package ca.uhn.fhir.rest.server.exceptions; - -import java.lang.reflect.InvocationTargetException; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import ca.uhn.fhir.model.base.resource.BaseOperationOutcome; - -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 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% - */ - -/** - * Base class for RESTful client and server exceptions. RESTful client methods will only throw exceptions which are subclasses of this exception type, and RESTful server methods should also only call - * subclasses of this exception type. - */ -public abstract class BaseServerResponseException extends RuntimeException { - - private static final Map> ourStatusCodeToExceptionType = new HashMap>(); - private static final long serialVersionUID = 1L; - - static { - registerExceptionType(AuthenticationException.STATUS_CODE, AuthenticationException.class); - registerExceptionType(InternalErrorException.STATUS_CODE, InternalErrorException.class); - registerExceptionType(InvalidRequestException.STATUS_CODE, InvalidRequestException.class); - registerExceptionType(MethodNotAllowedException.STATUS_CODE, MethodNotAllowedException.class); - registerExceptionType(ResourceNotFoundException.STATUS_CODE, ResourceNotFoundException.class); - registerExceptionType(ResourceVersionNotSpecifiedException.STATUS_CODE, ResourceVersionNotSpecifiedException.class); - registerExceptionType(ResourceVersionConflictException.STATUS_CODE, ResourceVersionConflictException.class); - registerExceptionType(UnprocessableEntityException.STATUS_CODE, UnprocessableEntityException.class); - registerExceptionType(ResourceGoneException.STATUS_CODE, ResourceGoneException.class); - registerExceptionType(NotImplementedOperationException.STATUS_CODE, NotImplementedOperationException.class); - } - -<<<<<<< HEAD -======= - private List myAdditionalMessages = null; ->>>>>>> d22a35788f57e9f7ce64bc8afc2ee7eaf29d94f2 - private BaseOperationOutcome myBaseOperationOutcome; - private String myResponseBody; - private String myResponseMimeType; - private int myStatusCode; - - /** - * Constructor - * - * @param theStatusCode - * The HTTP status code corresponding to this problem - * @param theMessage - * The message - */ - public BaseServerResponseException(int theStatusCode, String theMessage) { - super(theMessage); - myStatusCode = theStatusCode; - myBaseOperationOutcome = null; -<<<<<<< HEAD -======= - } - - /** - * Constructor - * - * @param theStatusCode - * The HTTP status code corresponding to this problem - * @param theMessage - * The message - */ - public BaseServerResponseException(int theStatusCode, String... theMessages) { - super(theMessages != null && theMessages.length > 0 ? theMessages[0] : null); - myStatusCode = theStatusCode; - myBaseOperationOutcome = null; - if (theMessages != null && theMessages.length > 1) { - myAdditionalMessages = Arrays.asList(Arrays.copyOfRange(theMessages, 1, theMessages.length, String[].class)); - } ->>>>>>> d22a35788f57e9f7ce64bc8afc2ee7eaf29d94f2 - } - - /** - * Constructor - * - * @param theStatusCode - * The HTTP status code corresponding to this problem - * @param theMessage - * The message - * @param theBaseOperationOutcome -<<<<<<< HEAD - * An BaseOperationOutcome resource to return to the calling client (in a server) or the BaseOperationOutcome - * that was returned from the server (in a client) -======= - * An BaseOperationOutcome resource to return to the calling client (in a server) or the BaseOperationOutcome that was returned from the server (in a client) ->>>>>>> d22a35788f57e9f7ce64bc8afc2ee7eaf29d94f2 - */ - public BaseServerResponseException(int theStatusCode, String theMessage, BaseOperationOutcome theBaseOperationOutcome) { - super(theMessage); - myStatusCode = theStatusCode; - myBaseOperationOutcome = theBaseOperationOutcome; - } - - /** - * Constructor - * - * @param theStatusCode - * The HTTP status code corresponding to this problem - * @param theMessage - * The message - * @param theCause - * The cause - */ - public BaseServerResponseException(int theStatusCode, String theMessage, Throwable theCause) { - super(theMessage, theCause); - myStatusCode = theStatusCode; - myBaseOperationOutcome = null; - } - - /** - * Constructor - * - * @param theStatusCode - * The HTTP status code corresponding to this problem - * @param theMessage - * The message - * @param theCause - * The underlying cause exception - * @param theBaseOperationOutcome -<<<<<<< HEAD - * An BaseOperationOutcome resource to return to the calling client (in a server) or the BaseOperationOutcome - * that was returned from the server (in a client) -======= - * An BaseOperationOutcome resource to return to the calling client (in a server) or the BaseOperationOutcome that was returned from the server (in a client) ->>>>>>> d22a35788f57e9f7ce64bc8afc2ee7eaf29d94f2 - */ - public BaseServerResponseException(int theStatusCode, String theMessage, Throwable theCause, BaseOperationOutcome theBaseOperationOutcome) { - super(theMessage, theCause); - myStatusCode = theStatusCode; - myBaseOperationOutcome = theBaseOperationOutcome; - } - - /** - * Constructor - * - * @param theStatusCode - * The HTTP status code corresponding to this problem - * @param theCause - * The underlying cause exception - */ - public BaseServerResponseException(int theStatusCode, Throwable theCause) { - super(theCause.toString(), theCause); - myStatusCode = theStatusCode; - myBaseOperationOutcome = null; - } - - /** - * Constructor - * - * @param theStatusCode - * The HTTP status code corresponding to this problem - * @param theCause - * The underlying cause exception - * @param theBaseOperationOutcome -<<<<<<< HEAD - * An BaseOperationOutcome resource to return to the calling client (in a server) or the BaseOperationOutcome - * that was returned from the server (in a client) -======= - * An BaseOperationOutcome resource to return to the calling client (in a server) or the BaseOperationOutcome that was returned from the server (in a client) ->>>>>>> d22a35788f57e9f7ce64bc8afc2ee7eaf29d94f2 - */ - public BaseServerResponseException(int theStatusCode, Throwable theCause, BaseOperationOutcome theBaseOperationOutcome) { - super(theCause.toString(), theCause); - myStatusCode = theStatusCode; - myBaseOperationOutcome = theBaseOperationOutcome; -<<<<<<< HEAD -======= - } - - public List getAdditionalMessages() { - return myAdditionalMessages; ->>>>>>> d22a35788f57e9f7ce64bc8afc2ee7eaf29d94f2 - } - - /** - * Returns the {@link BaseOperationOutcome} resource if any which was supplied in the response, or null - */ - public BaseOperationOutcome getOperationOutcome() { - return myBaseOperationOutcome; - } - - /** - * In a RESTful client, this method will be populated with the body of the HTTP respone if one was provided by the server, or null otherwise. - *

- * In a restful server, this method is currently ignored. - *

- */ - public String getResponseBody() { - return myResponseBody; - } - - /** - * In a RESTful client, this method will be populated with the HTTP status code that was returned with the HTTP response. - *

- * In a restful server, this method is currently ignored. - *

- */ - public String getResponseMimeType() { - return myResponseMimeType; - } - - /** - * Returns the HTTP status code corresponding to this problem - */ - public int getStatusCode() { - return myStatusCode; - } - - /** -<<<<<<< HEAD - * Sets the BaseOperationOutcome resource associated with this exception. In server - * implementations, this is the OperartionOutcome resource to include with the HTTP response. In - * client implementations you should not call this method. - * - * @param theBaseOperationOutcome The BaseOperationOutcome resource -======= - * Sets the BaseOperationOutcome resource associated with this exception. In server implementations, this is the OperartionOutcome resource to include with the HTTP response. In client - * implementations you should not call this method. - * - * @param theBaseOperationOutcome - * The BaseOperationOutcome resource ->>>>>>> d22a35788f57e9f7ce64bc8afc2ee7eaf29d94f2 - */ - public void setOperationOutcome(BaseOperationOutcome theBaseOperationOutcome) { - myBaseOperationOutcome = theBaseOperationOutcome; - } - - /** - * This method is currently only called internally by HAPI, it should not be called by user code. - */ - public void setResponseBody(String theResponseBody) { - myResponseBody = theResponseBody; - } - - /** - * This method is currently only called internally by HAPI, it should not be called by user code. - */ - public void setResponseMimeType(String theResponseMimeType) { - myResponseMimeType = theResponseMimeType; - } - - /** - * For unit tests only - */ - static boolean isExceptionTypeRegistered(Class theType) { - return ourStatusCodeToExceptionType.values().contains(theType); - } - - public static BaseServerResponseException newInstance(int theStatusCode, String theMessage) { - if (ourStatusCodeToExceptionType.containsKey(theStatusCode)) { - try { - return ourStatusCodeToExceptionType.get(theStatusCode).getConstructor(new Class[] { String.class }).newInstance(theMessage); - } catch (InstantiationException e) { - throw new InternalErrorException(e); - } catch (IllegalAccessException e) { - throw new InternalErrorException(e); - } catch (IllegalArgumentException e) { - throw new InternalErrorException(e); - } catch (InvocationTargetException e) { - throw new InternalErrorException(e); - } catch (NoSuchMethodException e) { - throw new InternalErrorException(e); - } catch (SecurityException e) { - throw new InternalErrorException(e); - } - } else { - return new UnclassifiedServerFailureException(theStatusCode, theMessage); - } - } - - static void registerExceptionType(int theStatusCode, Class theType) { - if (ourStatusCodeToExceptionType.containsKey(theStatusCode)) { - throw new Error("Can not register " + theType + " to status code " + theStatusCode + " because " + ourStatusCodeToExceptionType.get(theStatusCode) + " already registers that code"); - } - ourStatusCodeToExceptionType.put(theStatusCode, theType); - } - -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/UnprocessableEntityException.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/UnprocessableEntityException.java index c9b17311245..c3eb87ea6e6 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/UnprocessableEntityException.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/UnprocessableEntityException.java @@ -20,16 +20,7 @@ package ca.uhn.fhir.rest.server.exceptions; * #L% */ -import java.util.List; -import java.util.Map; - -import ca.uhn.fhir.model.api.IElement; -import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum; import ca.uhn.fhir.model.base.resource.BaseOperationOutcome; -import ca.uhn.fhir.model.dstu.composite.ContainedDt; -import ca.uhn.fhir.model.dstu.composite.NarrativeDt; -import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.IdDt; import ca.uhn.fhir.rest.server.Constants; /** diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/UnprocessableEntityException.java.orig b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/UnprocessableEntityException.java.orig deleted file mode 100644 index 7439ef94f15..00000000000 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/exceptions/UnprocessableEntityException.java.orig +++ /dev/null @@ -1,87 +0,0 @@ -package ca.uhn.fhir.rest.server.exceptions; - -/* - * #%L - * HAPI FHIR - Core Library - * %% - * Copyright (C) 2014 University Health Network - * %% - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * #L% - */ - -import java.util.List; -import java.util.Map; - -import ca.uhn.fhir.model.api.IElement; -import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum; -import ca.uhn.fhir.model.base.resource.BaseOperationOutcome; -import ca.uhn.fhir.model.dstu.composite.ContainedDt; -import ca.uhn.fhir.model.dstu.composite.NarrativeDt; -import ca.uhn.fhir.model.primitive.CodeDt; -import ca.uhn.fhir.model.primitive.IdDt; -import ca.uhn.fhir.rest.server.Constants; - -/** - * Represents an HTTP 422 Unprocessable Entity response, which means that a resource was rejected by the server because it "violated applicable FHIR profiles or server business rules". - * - *

- * This exception will generally contain an {@link BaseOperationOutcome} instance which details the failure. - *

- * - * @see InvalidRequestException Which corresponds to an HTTP 400 Bad Request failure - */ -public class UnprocessableEntityException extends BaseServerResponseException { - - private static final String DEFAULT_MESSAGE = "Unprocessable Entity"; - private static final long serialVersionUID = 1L; - public static final int STATUS_CODE = Constants.STATUS_HTTP_422_UNPROCESSABLE_ENTITY; - - /** - * Constructor - * - * @param theMessage - * The message to add to the status line - * @param theOperationOutcome The BaseOperationOutcome resource to return to the client - */ - public UnprocessableEntityException(String theMessage, BaseOperationOutcome theOperationOutcome) { - super(STATUS_CODE, theMessage, theOperationOutcome); - } - - - /** - * Constructor which accepts an {@link BaseOperationOutcome} resource which will be supplied in the response - */ - public UnprocessableEntityException(BaseOperationOutcome theOperationOutcome) { - super(STATUS_CODE, DEFAULT_MESSAGE, theOperationOutcome); - } - - /** - * Constructor which accepts a String describing the issue. This string will be translated into an {@link BaseOperationOutcome} resource which will be supplied in the response. - */ - public UnprocessableEntityException(String theMessage) { - super(STATUS_CODE, theMessage); - } - - /** - * Constructor which accepts an array of Strings describing the issue. This strings will be translated into an {@link BaseOperationOutcome} resource which will be supplied in the response. - */ - public UnprocessableEntityException(String... theMessage) { -<<<<<<< HEAD - super(STATUS_CODE, theMessage[0]); // TODO: this used to generate an OperationOutcome - why? -======= - super(STATUS_CODE, theMessage); ->>>>>>> d22a35788f57e9f7ce64bc8afc2ee7eaf29d94f2 - } - -} diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/FhirValidator.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/FhirValidator.java index 284be21462a..63a0aa0f7ea 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/FhirValidator.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/FhirValidator.java @@ -31,10 +31,6 @@ import ca.uhn.fhir.model.api.Bundle; import ca.uhn.fhir.model.api.IResource; import ca.uhn.fhir.model.base.resource.BaseOperationOutcome; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - /** * Resource validator, which checks resources for compliance against various validation schemes (schemas, schematrons, etc.) * diff --git a/hapi-fhir-oauth2/pom.xml b/hapi-fhir-oauth2/pom.xml index b8f182797ab..5171085fdce 100644 --- a/hapi-fhir-oauth2/pom.xml +++ b/hapi-fhir-oauth2/pom.xml @@ -12,6 +12,7 @@ jar HAPI FHIR - OAUTH2 Support +