honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ja_20190928_rationalize_search_param_extractor

This commit is contained in:
James Agnew 2019-10-27 18:00:31 -04:00
parent 817f9ae36e a82da8de1c
commit d18550b96f
10 changed files with 67 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hapi-fhir-base/src/main/java/org/hl7/fhir/instance/model/api/IBaseEnumeration.java
View File

@ -23,6 +23,6 @@ package org.hl7.fhir.instance.model.api;
public interface IBaseEnumeration<T extends Enum<?>> extends IPrimitiveType<T> {
IBaseEnumFactory<T> getEnumFactory();
default IBaseEnumFactory<T> getEnumFactory() { return null; }
}

2
hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/util/SourceParam.java
View File

@ -6,7 +6,7 @@ import static org.apache.commons.lang3.StringUtils.left;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR Search Parameters
* %%
* Copyright (C) 2014 - 2019 University Health Network
* %%

2
hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IPreResourceAccessDetails.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.api.server;
/*-
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Server Framework
* %%
* Copyright (C) 2014 - 2019 University Health Network
* %%

2
hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IPreResourceShowDetails.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.api.server;
/*-
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Server Framework
* %%
* Copyright (C) 2014 - 2019 University Health Network
* %%

2
hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/IServerMethodBinding.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.api.server;
/*-
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Server Framework
* %%
* Copyright (C) 2014 - 2019 University Health Network
* %%

2
hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/SimplePreResourceAccessDetails.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.api.server;
/*-
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Server Framework
* %%
* Copyright (C) 2014 - 2019 University Health Network
* %%

2
hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/api/server/SimplePreResourceShowDetails.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.api.server;
/*-
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Server Framework
* %%
* Copyright (C) 2014 - 2019 University Health Network
* %%

20
hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/CaptureResourceSourceFromHeaderInterceptor.java
View File

@ -1,5 +1,25 @@
package ca.uhn.fhir.rest.server.interceptor;
/*-
* #%L
* HAPI FHIR - Server Framework
* %%
* Copyright (C) 2014 - 2019 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.context.FhirContext;
import ca.uhn.fhir.interceptor.api.Hook;

20
hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/HashMapResourceProviderRule.java
View File

@ -1,5 +1,25 @@
package ca.uhn.fhir.test.utilities.server;
/*-
* #%L
* HAPI FHIR Test Utilities
* %%
* Copyright (C) 2014 - 2019 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.provider.HashMapResourceProvider;
import org.hl7.fhir.instance.model.api.IBaseResource;
import org.junit.rules.TestRule;

20
hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/server/RestfulServerRule.java
View File

@ -1,5 +1,25 @@
package ca.uhn.fhir.test.utilities.server;
/*-
* #%L
* HAPI FHIR Test Utilities
* %%
* Copyright (C) 2014 - 2019 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.context.FhirContext;
import ca.uhn.fhir.rest.client.api.IGenericClient;
import ca.uhn.fhir.rest.client.api.ServerValidationModeEnum;