From 4c4ea1bde074e555a1c52dc78487b874db032c31 Mon Sep 17 00:00:00 2001 From: James Agnew Date: Thu, 12 Mar 2015 10:07:36 -0400 Subject: [PATCH] Change default bundle inclusion behaviour back to original behaviour, new behaviour is reported to be buggy --- .../java/ca/uhn/fhir/model/api/Bundle.java | 26 ------------------- .../fhir/rest/server/BundleInclusionRule.java | 20 ++++++++++++++ .../ExceptionHandlingInterceptor.java | 20 ++++++++++++++ .../uhn/fhir/util/ResourceReferenceInfo.java | 20 ++++++++++++++ 4 files changed, 60 insertions(+), 26 deletions(-) diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Bundle.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Bundle.java index 169467d3b8b..7f29a9f4ef7 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Bundle.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/model/api/Bundle.java @@ -250,32 +250,6 @@ public class Bundle extends BaseBundle /* implements IElement */{ return myEntries; } - // public static void main(String[] args) { - // - // FhirContext ctx = new FhirContext(); - // String txt = "\n" + - // " \n" + - // " \n" + - // " \n" + - // " \n" + - // " \n" + - // "
\n" + - // " \n" + - // " \n" + - // " \n" + - // " \n" + - // " \n" + - // ""; - // - // IGenericClient c = ctx.newRestfulGenericClient("http://fhirtest.uhn.ca/base"); - // c.registerInterceptor(new LoggingInterceptor(true)); - // c.update().resource(txt).withId("1665").execute(); - // } - // - public StringDt getLinkBase() { if (myLinkBase == null) { myLinkBase = new StringDt(); diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/BundleInclusionRule.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/BundleInclusionRule.java index 7dbad15a0ec..19a85f43894 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/BundleInclusionRule.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/BundleInclusionRule.java @@ -1,5 +1,25 @@ package ca.uhn.fhir.rest.server; +/* + * #%L + * HAPI FHIR - Core Library + * %% + * Copyright (C) 2014 - 2015 University Health Network + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + import ca.uhn.fhir.model.api.Include; import ca.uhn.fhir.util.ResourceReferenceInfo; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/ExceptionHandlingInterceptor.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/ExceptionHandlingInterceptor.java index 536aa9ba21b..04d949d7f32 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/ExceptionHandlingInterceptor.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/server/interceptor/ExceptionHandlingInterceptor.java @@ -1,5 +1,25 @@ package ca.uhn.fhir.rest.server.interceptor; +/* + * #%L + * HAPI FHIR - Core Library + * %% + * Copyright (C) 2014 - 2015 University Health Network + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + import java.io.IOException; import javax.servlet.ServletException; diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ResourceReferenceInfo.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ResourceReferenceInfo.java index a293c229113..ebdd321431c 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ResourceReferenceInfo.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ResourceReferenceInfo.java @@ -1,5 +1,25 @@ package ca.uhn.fhir.util; +/* + * #%L + * HAPI FHIR - Core Library + * %% + * Copyright (C) 2014 - 2015 University Health Network + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ + import ca.uhn.fhir.model.api.Include; import ca.uhn.fhir.model.api.annotation.ResourceDef; import ca.uhn.fhir.model.base.composite.BaseResourceReferenceDt;