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 'hapi3_refactor' of github.com:jamesagnew/hapi-fhir into hapi3_refactor

This commit is contained in:
James Agnew 2017-08-13 22:42:00 -04:00
parent 5413b276af 209752cd63
commit d851de7ffd
239 changed files with 73996 additions and 72467 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -320,8 +320,8 @@ public class FhirContext {
Map<String, Class<? extends IBaseResource>> nameToType = myVersionToNameToResourceType.get(theVersion);
if (nameToType == null) {
nameToType = new HashMap<String, Class<? extends IBaseResource>>();
Map<Class<? extends IBase>, BaseRuntimeElementDefinition<?>> existing = Collections.emptyMap();
nameToType = new HashMap<>();
Map<Class<? extends IBase>, BaseRuntimeElementDefinition<?>> existing = new HashMap<>();
ModelScanner.scanVersionPropertyFile(null, nameToType, theVersion, existing);
Map<FhirVersionEnum, Map<String, Class<? extends IBaseResource>>> newVersionToNameToResourceType = new HashMap<FhirVersionEnum, Map<String, Class<? extends IBaseResource>>>();
@ -905,4 +905,24 @@ public class FhirContext {
return retVal;
}
/**
* Returns an unmodifiable set containing all resource names known to this
* context
*/
public Set<String> getResourceNames() {
Set<String> resourceNames= new HashSet<>();
if (myNameToResourceDefinition.isEmpty()) {
}
for (RuntimeResourceDefinition next : myNameToResourceDefinition.values()) {
resourceNames.add(next.getName());
}
// Properties versionProperties = new Properties();
// versionProperties.load(myVersion.getFhirVersionPropertiesFile());
//
return Collections.unmodifiableSet(resourceNames);
}
}

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

@ -1,5 +1,25 @@
package ca.uhn.fhir.parser;
/*-
* #%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 static org.apache.commons.lang3.StringUtils.isBlank;
import static org.apache.commons.lang3.StringUtils.isNotBlank;

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

@ -1,5 +1,25 @@
package ca.uhn.fhir.rest.api.server;
/*-
* #%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 java.util.*;
import ca.uhn.fhir.context.FhirContext;

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

@ -1,5 +1,25 @@
package ca.uhn.fhir.rest.api.server;
/*-
* #%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%
*/
public interface IServerMethodBinding {
}

20
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/client/api/IBasicClient.java
View File

@ -1,5 +1,25 @@
package 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 org.hl7.fhir.instance.model.api.IBaseConformance;
import ca.uhn.fhir.rest.annotation.Metadata;

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

@ -1,5 +1,25 @@
package 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 org.hl7.fhir.instance.model.api.IBaseBundle;
import org.hl7.fhir.instance.model.api.IBaseResource;

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

@ -1,5 +1,25 @@
package ca.uhn.fhir.rest.gclient;
/*-
* #%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.context.FhirContext;
import ca.uhn.fhir.rest.api.Constants;

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

@ -1,5 +1,25 @@
package ca.uhn.fhir.rest.gclient;
/*-
* #%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.api.MethodOutcome;
import ca.uhn.fhir.rest.api.PreferReturnEnum;

20
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/BaseParamWithPrefix.java
View File

@ -1,5 +1,25 @@
package ca.uhn.fhir.rest.param;
/*-
* #%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 static org.apache.commons.lang3.StringUtils.isBlank;
public abstract class BaseParamWithPrefix<T extends BaseParam> extends BaseParam {

20
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/ParamPrefixEnum.java
View File

@ -1,5 +1,25 @@
package ca.uhn.fhir.rest.param;
/*-
* #%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 java.util.*;
/**

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

@ -1,5 +1,25 @@
package ca.uhn.fhir.rest.param;
/*-
* #%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 java.util.Set;
public class QualifierDetails {

2
hapi-fhir-cli/hapi-fhir-cli-app/src/main/java/ca/uhn/fhir/cli/BaseCommand.java
View File

@ -57,6 +57,8 @@ public abstract class BaseCommand implements Comparable<BaseCommand> {
version = FhirVersionEnum.DSTU2;
} else if ("dstu3".equals(specVersion)) {
version = FhirVersionEnum.DSTU3;
} else if ("r4".equals(specVersion)) {
version = FhirVersionEnum.R4;
} else {
throw new ParseException("Unknown spec version: " + specVersion);
}

82
hapi-fhir-cli/hapi-fhir-cli-app/src/main/java/ca/uhn/fhir/cli/ExampleDataUploader.java
View File

@ -114,6 +114,9 @@ public class ExampleDataUploader extends BaseCommand {
specUrl = "http://hl7.org/fhir/dstu2/examples-json.zip";
break;
case DSTU3:
specUrl = "http://hl7.org/fhir/STU3/examples-json.zip";
break;
case R4:
specUrl = "http://build.fhir.org/examples-json.zip";
break;
default:
@ -197,18 +200,20 @@ public class ExampleDataUploader extends BaseCommand {
}
private IBaseBundle getBundleFromFile(Integer theLimit, File theSuppliedFile, FhirContext theCtx) throws ParseException, UnsupportedEncodingException, IOException {
private IBaseBundle getBundleFromFile(Integer theLimit, File theSuppliedFile, FhirContext theCtx) throws ParseException, IOException {
switch (theCtx.getVersion().getVersion()) {
case DSTU2:
return getBundleFromFileDstu2(theLimit, theSuppliedFile, theCtx);
case DSTU3:
return getBundleFromFileDstu3(theLimit, theSuppliedFile, theCtx);
case R4:
return getBundleFromFileDstu3(theLimit, theSuppliedFile, theCtx);
default:
throw new ParseException("Invalid spec version for this command: " + theCtx.getVersion().getVersion());
}
}
private void sendBundleToTarget(String targetServer, FhirContext ctx, IBaseBundle bundle) throws Exception, IOException {
private void sendBundleToTarget(String targetServer, FhirContext ctx, IBaseBundle bundle) throws Exception {
List<IBaseResource> resources = BundleUtil.toListOfResources(ctx, bundle);
for (Iterator<IBaseResource> iter = resources.iterator(); iter.hasNext(); ) {
@ -223,13 +228,13 @@ public class ExampleDataUploader extends BaseCommand {
}
}
List<IBaseResource> subResourceList = new ArrayList<IBaseResource>();
List<IBaseResource> subResourceList = new ArrayList<>();
while (resources.size() > 0) {
IBaseResource nextAddedResource = resources.remove(0);
subResourceList.add(nextAddedResource);
Set<String> checkedTargets = new HashSet<String>();
Set<String> checkedTargets = new HashSet<>();
for (int i = 0; i < subResourceList.size(); i++) {
IBaseResource nextCandidateSource = subResourceList.get(i);
@ -319,6 +324,9 @@ public class ExampleDataUploader extends BaseCommand {
case DSTU3:
processBundleDstu3(ctx, (org.hl7.fhir.dstu3.model.Bundle) bundle);
break;
case R4:
processBundleR4(ctx, (org.hl7.fhir.r4.model.Bundle) bundle);
break;
default:
throw new IllegalStateException();
}
@ -484,6 +492,72 @@ public class ExampleDataUploader extends BaseCommand {
}
private void processBundleR4(FhirContext ctx, org.hl7.fhir.r4.model.Bundle bundle) {
Map<String, Integer> ids = new HashMap<String, Integer>();
Set<String> fullIds = new HashSet<String>();
for (Iterator<org.hl7.fhir.r4.model.Bundle.BundleEntryComponent> iterator = bundle.getEntry().iterator(); iterator.hasNext(); ) {
org.hl7.fhir.r4.model.Bundle.BundleEntryComponent next = iterator.next();
// DataElement have giant IDs that seem invalid, need to investigate this..
if ("Subscription".equals(next.getResource().getResourceType()) || "DataElement".equals(next.getResource().getResourceType())
|| "OperationOutcome".equals(next.getResource().getResourceType()) || "OperationDefinition".equals(next.getResource().getResourceType())) {
ourLog.info("Skipping " + next.getResource().getResourceType() + " example");
iterator.remove();
} else {
IdDt resourceId = new IdDt(next.getResource().getResourceType() + "/EX" + next.getResource().getIdElement().getIdPart());
if (!fullIds.add(resourceId.toUnqualifiedVersionless().getValue())) {
ourLog.info("Discarding duplicate resource: " + resourceId.getValue());
iterator.remove();
continue;
}
String idPart = resourceId.getIdPart();
if (idPart != null) {
next.getResource().setId(resourceId);
} else {
ourLog.info("Discarding resource with not explicit ID");
iterator.remove();
}
}
}
Set<String> qualIds = new TreeSet<String>();
for (Iterator<org.hl7.fhir.r4.model.Bundle.BundleEntryComponent> iterator = bundle.getEntry().iterator(); iterator.hasNext(); ) {
org.hl7.fhir.r4.model.Bundle.BundleEntryComponent next = iterator.next();
if (next.getResource().getIdElement().getIdPart() != null) {
String nextId = next.getResource().getIdElement().getValue();
next.getRequest().setMethod(org.hl7.fhir.r4.model.Bundle.HTTPVerb.PUT);
next.getRequest().setUrl(nextId);
}
}
int goodRefs = 0;
for (org.hl7.fhir.r4.model.Bundle.BundleEntryComponent next : bundle.getEntry()) {
List<ResourceReferenceInfo> refs = ctx.newTerser().getAllResourceReferences(next.getResource());
for (ResourceReferenceInfo nextRef : refs) {
nextRef.getResourceReference().setResource(null);
String value = nextRef.getResourceReference().getReferenceElement().toUnqualifiedVersionless().getValue();
if (isNotBlank(value)) {
if (!qualIds.contains(value) && !nextRef.getResourceReference().getReferenceElement().isLocal()) {
ourLog.info("Discarding unknown reference: {}", value);
nextRef.getResourceReference().getReferenceElement().setValue(null);
} else {
goodRefs++;
}
}
ourLog.info("Found ref: {}", value);
}
}
ourLog.info("{} good references", goodRefs);
System.gc();
ourLog.info("Final bundle: {} entries", bundle.getEntry().size());
}
private Bundle getBundleFromFileDstu2(Integer limit, File inputFile, FhirContext ctx) throws IOException, UnsupportedEncodingException {
Bundle bundle = new Bundle();

2
hapi-fhir-cli/hapi-fhir-cli-app/src/main/java/ca/uhn/fhir/cli/UploadTerminologyCommand.java
View File

@ -20,11 +20,9 @@ public class UploadTerminologyCommand extends BaseCommand {
@Override
public String getCommandDescription() {
//@formatter:off
return "Uploads a terminology package (e.g. a SNOMED CT ZIP file) to a HAPI JPA server. "
+ "Note that this command uses a custom operation that is only implemented on HAPI "
+ "JPA servers that have been configured to accept it.";
//@formatter:on
}
@Override

91
hapi-fhir-cli/hapi-fhir-cli-app/src/main/java/ca/uhn/fhir/cli/ValidationDataUploader.java
View File

@ -65,6 +65,8 @@ public class ValidationDataUploader extends BaseCommand {
uploadDefinitionsDstu2(targetServer, ctx);
} else if (ctx.getVersion().getVersion() == FhirVersionEnum.DSTU3){
uploadDefinitionsDstu3(targetServer, ctx);
} else if (ctx.getVersion().getVersion() == FhirVersionEnum.R4){
uploadDefinitionsR4(targetServer, ctx);
}
}
@ -256,6 +258,95 @@ public class ValidationDataUploader extends BaseCommand {
ourLog.info("Finished uploading definitions to server (took {} ms)", delay);
}
private void uploadDefinitionsR4(String theTargetServer, FhirContext theCtx) throws CommandFailureException {
IGenericClient client = newClient(theCtx, theTargetServer);
ourLog.info("Uploading definitions to server: " + theTargetServer);
long start = System.currentTimeMillis();
int total = 0;
int count = 0;
org.hl7.fhir.r4.model.Bundle bundle;
String vsContents;
try {
theCtx.getVersion().getPathToSchemaDefinitions();
vsContents = IOUtils.toString(ValidationDataUploader.class.getResourceAsStream("/org/hl7/fhir/r4/model/valueset/"+"valuesets.xml"), "UTF-8");
} catch (IOException e) {
throw new CommandFailureException(e.toString());
}
bundle = theCtx.newXmlParser().parseResource(org.hl7.fhir.r4.model.Bundle.class, vsContents);
total = bundle.getEntry().size();
count = 1;
for (org.hl7.fhir.r4.model.Bundle.BundleEntryComponent i : bundle.getEntry()) {
org.hl7.fhir.r4.model.Resource next = i.getResource();
next.setId(next.getIdElement().toUnqualifiedVersionless());
int bytes = theCtx.newXmlParser().encodeResourceToString(next).length();
ourLog.info("Uploading ValueSet {}/{} : {} ({} bytes}", new Object[] { count, total, next.getIdElement().getValue(), bytes });
try {
IIdType id = client.update().resource(next).execute().getId();
ourLog.info(" - Got ID: {}", id.getValue());
} catch (UnprocessableEntityException e) {
ourLog.warn("UnprocessableEntityException: " + e.toString());
}
count++;
}
try {
vsContents = IOUtils.toString(ValidationDataUploader.class.getResourceAsStream("/org/hl7/fhir/r4/model/valueset/"+"v3-codesystems.xml"), "UTF-8");
} catch (IOException e) {
throw new CommandFailureException(e.toString());
}
bundle = theCtx.newXmlParser().parseResource(org.hl7.fhir.r4.model.Bundle.class, vsContents);
total = bundle.getEntry().size();
count = 1;
for (org.hl7.fhir.r4.model.Bundle.BundleEntryComponent i : bundle.getEntry()) {
org.hl7.fhir.r4.model.Resource next = i.getResource();
next.setId(next.getIdElement().toUnqualifiedVersionless());
ourLog.info("Uploading v3-codesystems ValueSet {}/{} : {}", new Object[] { count, total, next.getIdElement().getValue() });
client.update().resource(next).execute();
count++;
}
try {
vsContents = IOUtils.toString(ValidationDataUploader.class.getResourceAsStream("/org/hl7/fhir/r4/model/valueset/"+"v2-tables.xml"), "UTF-8");
} catch (IOException e) {
throw new CommandFailureException(e.toString());
}
bundle = theCtx.newXmlParser().parseResource(org.hl7.fhir.r4.model.Bundle.class, vsContents);
total = bundle.getEntry().size();
count = 1;
for (org.hl7.fhir.r4.model.Bundle.BundleEntryComponent i : bundle.getEntry()) {
org.hl7.fhir.r4.model.Resource next = i.getResource();
if (next.getIdElement().isIdPartValidLong()) {
next.setIdElement(new org.hl7.fhir.r4.model.IdType("v2-"+ next.getIdElement().getIdPart()));
}
next.setId(next.getIdElement().toUnqualifiedVersionless());
ourLog.info("Uploading v2-tables ValueSet {}/{} : {}", new Object[] { count, total, next.getIdElement().getValue() });
client.update().resource(next).execute();
count++;
}
ourLog.info("Finished uploading ValueSets");
uploadDstu3Profiles(theCtx, client, "profiles-resources");
uploadDstu3Profiles(theCtx, client, "profiles-types");
uploadDstu3Profiles(theCtx, client, "profiles-others");
ourLog.info("Finished uploading ValueSets");
long delay = System.currentTimeMillis() - start;
ourLog.info("Finished uploading definitions to server (took {} ms)", delay);
}
private void uploadDstu3Profiles(FhirContext ctx, IGenericClient client, String name) throws CommandFailureException {
int total;
int count;

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttpClient.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.apache;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttpRequest.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.apache;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttpResponse.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.apache;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

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

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.apache;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

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

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.apache;
/*-
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

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

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.apache;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

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

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.impl;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

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

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.impl;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

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

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.impl;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

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

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.impl;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

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

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.impl;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

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

@ -18,7 +18,7 @@ import ca.uhn.fhir.rest.client.api.IGenericClient;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

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

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.impl;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

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

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.interceptor;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

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

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.interceptor;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

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

@ -1,5 +1,25 @@
package ca.uhn.fhir.rest.client.interceptor;
/*-
* #%L
* HAPI FHIR - Client Framework
* %%
* 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 java.io.IOException;
import org.apache.http.HttpEntity;

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

@ -1,5 +1,25 @@
package ca.uhn.fhir.rest.client.interceptor;
/*-
* #%L
* HAPI FHIR - Client Framework
* %%
* 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.api.Constants;
import ca.uhn.fhir.rest.client.api.*;

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

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.interceptor;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

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

@ -4,7 +4,7 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

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

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.interceptor;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

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

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseHttpClientInvocationWithContents.java
View File

@ -4,7 +4,7 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

20
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseMethodBinding.java
View File

@ -1,5 +1,25 @@
package ca.uhn.fhir.rest.client.method;
/*-
* #%L
* HAPI FHIR - Client Framework
* %%
* 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 java.io.IOException;
import java.io.Reader;
import java.lang.reflect.Method;

20
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseOutcomeReturningMethodBinding.java
View File

@ -1,5 +1,25 @@
package ca.uhn.fhir.rest.client.method;
/*-
* #%L
* HAPI FHIR - Client Framework
* %%
* 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 java.io.Reader;
import java.lang.reflect.Method;
import java.util.*;

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseOutcomeReturningMethodBindingWithResourceIdButNoResourceBody.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseOutcomeReturningMethodBindingWithResourceParam.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseQueryParameter.java
View File

@ -4,7 +4,7 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

20
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/BaseResourceReturningMethodBinding.java
View File

@ -1,5 +1,25 @@
package ca.uhn.fhir.rest.client.method;
/*-
* #%L
* HAPI FHIR - Client Framework
* %%
* 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 java.io.Reader;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ConditionalParamBinder.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ConformanceMethodBinding.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/CountParameter.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/CreateMethodBinding.java
View File

@ -4,7 +4,7 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/DeleteMethodBinding.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ElementsParameter.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HistoryMethodBinding.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HttpDeleteClientInvocation.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HttpGetClientInvocation.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HttpPatchClientInvocation.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HttpPostClientInvocation.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HttpPutClientInvocation.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/HttpSimpleGetClientInvocation.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IClientResponseHandler.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IClientResponseHandlerHandlesBinary.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IParameter.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IRestfulHeader.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/IncludeParameter.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/MethodUtil.java
View File

@ -27,7 +27,7 @@ import ca.uhn.fhir.util.*;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/NullParameter.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/OperationMethodBinding.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/OperationParameter.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

20
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/PageMethodBinding.java
View File

@ -1,5 +1,25 @@
package ca.uhn.fhir.rest.client.method;
/*-
* #%L
* HAPI FHIR - Client Framework
* %%
* 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 java.lang.reflect.Method;
import org.hl7.fhir.instance.model.api.IBaseResource;

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/PatchMethodBinding.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/PatchTypeParameter.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/RawParamsParmeter.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ReadMethodBinding.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

20
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ResourceParameter.java
View File

@ -1,5 +1,25 @@
package ca.uhn.fhir.rest.client.method;
/*-
* #%L
* HAPI FHIR - Client Framework
* %%
* 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 java.lang.reflect.Method;
import java.util.Collection;
import java.util.List;

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/SearchMethodBinding.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/SearchParameter.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ServerBaseParamBinder.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

20
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/SinceOrAtParameter.java
View File

@ -1,5 +1,25 @@
package ca.uhn.fhir.rest.client.method;
/*-
* #%L
* HAPI FHIR - Client Framework
* %%
* 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%
*/
class SinceOrAtParameter extends SearchParameter {
// private Class<?> myType;

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/SinceParameter.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/SortParameter.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

20
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/SummaryEnumParameter.java
View File

@ -1,5 +1,25 @@
package ca.uhn.fhir.rest.client.method;
/*-
* #%L
* HAPI FHIR - Client Framework
* %%
* 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 java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;

20
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/TransactionMethodBinding.java
View File

@ -1,5 +1,25 @@
package ca.uhn.fhir.rest.client.method;
/*-
* #%L
* HAPI FHIR - Client Framework
* %%
* 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 java.lang.reflect.Method;
import java.util.List;

20
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/TransactionParameter.java
View File

@ -1,5 +1,25 @@
package ca.uhn.fhir.rest.client.method;
/*-
* #%L
* HAPI FHIR - Client Framework
* %%
* 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 java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.*;

20
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/UpdateMethodBinding.java
View File

@ -1,5 +1,25 @@
package ca.uhn.fhir.rest.client.method;
/*-
* #%L
* HAPI FHIR - Client Framework
* %%
* 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 static org.apache.commons.lang3.StringUtils.isBlank;
import java.lang.reflect.Method;

2
hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/method/ValidateMethodBindingDstu2Plus.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.client.method;
/*
* #%L
* HAPI FHIR - Core Library
* HAPI FHIR - Client Framework
* %%
* Copyright (C) 2014 - 2017 University Health Network
* %%

21
hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/CCDAConverter.java
View File

@ -1,5 +1,26 @@
package org.hl7.fhir.convertors;
/*-
* #%L
* HAPI FHIR - Converter
* %%
* 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%
*/
/*
Copyright (c) 2011+, HL7, Inc.

21
hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/CDAUtilities.java
View File

@ -1,5 +1,26 @@
package org.hl7.fhir.convertors;
/*-
* #%L
* HAPI FHIR - Converter
* %%
* 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%
*/
/*
Copyright (c) 2011+, HL7, Inc.

21
hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/CcdaExtensions.java
View File

@ -1,5 +1,26 @@
package org.hl7.fhir.convertors;
/*-
* #%L
* HAPI FHIR - Converter
* %%
* 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%
*/
public class CcdaExtensions {
public final static String DAF_NAME_RACE = "http://hl7.org/fhir/StructureDefinition/us-core-race";
public final static String DAF_NAME_ETHNICITY = "http://hl7.org/fhir/StructureDefinition/us-core-ethnicity";

21
hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/Convert.java
View File

@ -1,5 +1,26 @@
package org.hl7.fhir.convertors;
/*-
* #%L
* HAPI FHIR - Converter
* %%
* 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%
*/
/*
Copyright (c) 2011+, HL7, Inc.

21
hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/ConverterBase.java
View File

@ -1,5 +1,26 @@
package org.hl7.fhir.convertors;
/*-
* #%L
* HAPI FHIR - Converter
* %%
* 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%
*/
public class ConverterBase {
}

21
hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/ICPC2Importer.java
View File

@ -1,5 +1,26 @@
package org.hl7.fhir.convertors;
/*-
* #%L
* HAPI FHIR - Converter
* %%
* 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 java.io.FileInputStream;
import java.io.FileOutputStream;
import java.util.ArrayList;

21
hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/VersionConvertorAdvisor30.java
View File

@ -1,5 +1,26 @@
package org.hl7.fhir.convertors;
/*-
* #%L
* HAPI FHIR - Converter
* %%
* 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 org.hl7.fhir.exceptions.FHIRException;
public interface VersionConvertorAdvisor30 {

21
hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/VersionConvertorAdvisor40.java
View File

@ -1,5 +1,26 @@
package org.hl7.fhir.convertors;
/*-
* #%L
* HAPI FHIR - Converter
* %%
* 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 org.hl7.fhir.exceptions.FHIRException;
public interface VersionConvertorAdvisor40 {

21
hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_30.java
View File

@ -1,5 +1,26 @@
package org.hl7.fhir.convertors;
/*-
* #%L
* HAPI FHIR - Converter
* %%
* 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 java.util.ArrayList;
import java.util.List;

21
hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_40.java
View File

@ -1,5 +1,26 @@
package org.hl7.fhir.convertors;
/*-
* #%L
* HAPI FHIR - Converter
* %%
* 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 java.util.ArrayList;
import java.util.List;

21
hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_30.java
View File

@ -1,5 +1,26 @@
package org.hl7.fhir.convertors;
/*-
* #%L
* HAPI FHIR - Converter
* %%
* 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%
*/
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.

21
hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/VersionConvertor_14_40.java
View File

@ -1,5 +1,26 @@
package org.hl7.fhir.convertors;
/*-
* #%L
* HAPI FHIR - Converter
* %%
* 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%
*/
/*
Copyright (c) 2011+, HL7, Inc.
All rights reserved.

21
hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/VersionConvertor_30_40.java
View File

@ -1,5 +1,26 @@
package org.hl7.fhir.convertors;
/*-
* #%L
* HAPI FHIR - Converter
* %%
* 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 org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.r4.model.StructureDefinition.StructureDefinitionKind;
import org.hl7.fhir.r4.model.StructureDefinition.TypeDerivationRule;

45
hapi-fhir-dist/pom.xml
View File

@ -53,26 +53,6 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-structures-dstu</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-structures-dstu</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-structures-dstu</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-structures-dstu2</artifactId>
@ -153,6 +133,26 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-structures-r4</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-structures-r4</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-structures-r4</artifactId>
<version>${project.version}</version>
<classifier>javadoc</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-validation-resources-dstu2</artifactId>
@ -168,6 +168,11 @@
<artifactId>hapi-fhir-validation-resources-dstu3</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-validation-resources-r4</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>

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

@ -495,8 +495,8 @@ public abstract class BaseHapiFhirDao<T extends IBaseResource> implements IDao {
}
@SuppressWarnings("unchecked")
private <T extends BaseResourceIndexedSearchParam> void findMissingSearchParams(ResourceTable theEntity, Set<Entry<String, RuntimeSearchParam>> activeSearchParams, RestSearchParameterTypeEnum type,
Set<T> paramCollection) {
private <RT extends BaseResourceIndexedSearchParam> void findMissingSearchParams(ResourceTable theEntity, Set<Entry<String, RuntimeSearchParam>> activeSearchParams, RestSearchParameterTypeEnum type,
Set<RT> paramCollection) {
for (Entry<String, RuntimeSearchParam> nextEntry : activeSearchParams) {
String nextParamName = nextEntry.getKey();
if (nextEntry.getValue().getParamType() == type) {
@ -538,7 +538,7 @@ public abstract class BaseHapiFhirDao<T extends IBaseResource> implements IDao {
param.setResource(theEntity);
param.setMissing(true);
param.setParamName(nextParamName);
paramCollection.add((T) param);
paramCollection.add((RT) param);
}
}
}
@ -1278,35 +1278,35 @@ public abstract class BaseHapiFhirDao<T extends IBaseResource> implements IDao {
theEntity.setPublished(theUpdateTime);
}
Collection<ResourceIndexedSearchParamString> paramsString = new ArrayList<ResourceIndexedSearchParamString>();
Collection<ResourceIndexedSearchParamString> paramsString = new ArrayList<>();
if (theEntity.isParamsStringPopulated()) {
paramsString.addAll(theEntity.getParamsString());
}
Collection<ResourceIndexedSearchParamToken> paramsToken = new ArrayList<ResourceIndexedSearchParamToken>();
Collection<ResourceIndexedSearchParamToken> paramsToken = new ArrayList<>();
if (theEntity.isParamsTokenPopulated()) {
paramsToken.addAll(theEntity.getParamsToken());
}
Collection<ResourceIndexedSearchParamNumber> paramsNumber = new ArrayList<ResourceIndexedSearchParamNumber>();
Collection<ResourceIndexedSearchParamNumber> paramsNumber = new ArrayList<>();
if (theEntity.isParamsNumberPopulated()) {
paramsNumber.addAll(theEntity.getParamsNumber());
}
Collection<ResourceIndexedSearchParamQuantity> paramsQuantity = new ArrayList<ResourceIndexedSearchParamQuantity>();
Collection<ResourceIndexedSearchParamQuantity> paramsQuantity = new ArrayList<>();
if (theEntity.isParamsQuantityPopulated()) {
paramsQuantity.addAll(theEntity.getParamsQuantity());
}
Collection<ResourceIndexedSearchParamDate> paramsDate = new ArrayList<ResourceIndexedSearchParamDate>();
Collection<ResourceIndexedSearchParamDate> paramsDate = new ArrayList<>();
if (theEntity.isParamsDatePopulated()) {
paramsDate.addAll(theEntity.getParamsDate());
}
Collection<ResourceIndexedSearchParamUri> paramsUri = new ArrayList<ResourceIndexedSearchParamUri>();
Collection<ResourceIndexedSearchParamUri> paramsUri = new ArrayList<>();
if (theEntity.isParamsUriPopulated()) {
paramsUri.addAll(theEntity.getParamsUri());
}
Collection<ResourceIndexedSearchParamCoords> paramsCoords = new ArrayList<ResourceIndexedSearchParamCoords>();
Collection<ResourceIndexedSearchParamCoords> paramsCoords = new ArrayList<>();
if (theEntity.isParamsCoordsPopulated()) {
paramsCoords.addAll(theEntity.getParamsCoords());
}
Collection<ResourceLink> existingResourceLinks = new ArrayList<ResourceLink>();
Collection<ResourceLink> existingResourceLinks = new ArrayList<>();
if (theEntity.isHasLinks()) {
existingResourceLinks.addAll(theEntity.getResourceLinks());
}
@ -1524,7 +1524,7 @@ public abstract class BaseHapiFhirDao<T extends IBaseResource> implements IDao {
* those by path and not by parameter name.
*/
if (thePerformIndexing) {
Map<String, Boolean> presentSearchParams = new HashMap<String, Boolean>();
Map<String, Boolean> presentSearchParams = new HashMap<>();
for (String nextKey : populatedResourceLinkParameters) {
presentSearchParams.put(nextKey, Boolean.TRUE);
}

20
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/MetadataKeyResourcePid.java
View File

@ -1,5 +1,25 @@
package ca.uhn.fhir.jpa.dao;
/*-
* #%L
* HAPI FHIR JPA Server
* %%
* 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 org.hl7.fhir.instance.model.api.IAnyResource;
import ca.uhn.fhir.model.api.IResource;

3
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoSubscriptionR4.java
View File

@ -104,8 +104,9 @@ public class FhirResourceDaoSubscriptionR4 extends FhirResourceDaoR4<Subscriptio
return retVal;
}
@Transactional(propagation = Propagation.NOT_SUPPORTED)
public int pollForNewUndeliveredResources() {
return pollForNewUndeliveredResources((String) null);
return pollForNewUndeliveredResources(null);
}
@Override

20
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/IHapiTerminologySvcR4.java
View File

@ -1,5 +1,25 @@
package ca.uhn.fhir.jpa.term;
/*-
* #%L
* HAPI FHIR JPA Server
* %%
* 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 org.hl7.fhir.r4.hapi.ctx.IValidationSupport;
public interface IHapiTerminologySvcR4 extends IHapiTerminologySvc, IValidationSupport {

Some files were not shown because too many files have changed in this diff Show More