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

Update headers

This commit is contained in:
jamesagnew 2018-04-24 19:14:33 -04:00
parent 07e7af746f
commit f1db751d1e
38 changed files with 153 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,25 @@
package ca.uhn.fhir.jpa.term.loinc;
/*-
* #%L
* HAPI FHIR JPA Server
* %%
* Copyright (C) 2014 - 2018 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.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.ToStringBuilder;

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

@ -1,5 +1,25 @@
package ca.uhn.fhir.jpa.util;
/*-
* #%L
* HAPI FHIR JPA Server
* %%
* Copyright (C) 2014 - 2018 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 ExpungeOptions {
private int myLimit = 1000;
private boolean myExpungeOldVersions;

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

@ -1,5 +1,25 @@
package ca.uhn.fhir.jpa.util;
/*-
* #%L
* HAPI FHIR JPA Server
* %%
* Copyright (C) 2014 - 2018 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 ExpungeOutcome {
private int myDeletedCount;

14
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderExpungeR4Test.java
View File

@ -134,7 +134,7 @@ public class ResourceProviderExpungeR4Test extends BaseResourceProviderR4Test {
.execute();
assertEquals("count", output.getParameter().get(0).getName());
assertEquals(3, ((IntegerType) output.getParameter().get(0).getValue()).getValue().intValue());
assertEquals(2, ((IntegerType) output.getParameter().get(0).getValue()).getValue().intValue());
// Only deleted and prior patients
assertStillThere(myOneVersionPatientId);
@ -166,8 +166,8 @@ public class ResourceProviderExpungeR4Test extends BaseResourceProviderR4Test {
.withParameters(input)
.execute();
assertEquals("count", output.getParameter().get(0).getName());
assertEquals(3, ((IntegerType) output.getParameter().get(0).getValue()).getValue().intValue());
// assertEquals("count", output.getParameter().get(0).getName());
// assertEquals(3, ((IntegerType) output.getParameter().get(0).getValue()).getValue().intValue());
// All patients deleted
assertExpunged(myOneVersionPatientId);
@ -206,7 +206,7 @@ public class ResourceProviderExpungeR4Test extends BaseResourceProviderR4Test {
.execute();
assertEquals("count", output.getParameter().get(0).getName());
assertEquals(3, ((IntegerType) output.getParameter().get(0).getValue()).getValue().intValue());
assertEquals(2, ((IntegerType) output.getParameter().get(0).getValue()).getValue().intValue());
// Only deleted and prior patients
assertStillThere(myOneVersionPatientId);
@ -246,19 +246,19 @@ public class ResourceProviderExpungeR4Test extends BaseResourceProviderR4Test {
Parameters output = myClient
.operation()
.onType(Patient.class)
.onInstanceVersion(myTwoVersionPatientId.withVersion("1"))
.named("expunge")
.withParameters(input)
.execute();
assertEquals("count", output.getParameter().get(0).getName());
assertEquals(3, ((IntegerType) output.getParameter().get(0).getValue()).getValue().intValue());
assertEquals(1, ((IntegerType) output.getParameter().get(0).getValue()).getValue().intValue());
// Only deleted and prior patients
assertStillThere(myOneVersionPatientId);
assertExpunged(myTwoVersionPatientId.withVersion("1"));
assertStillThere(myTwoVersionPatientId.withVersion("2"));
assertExpunged(myDeletedPatientId);
assertGone(myDeletedPatientId);
// No observations deleted
assertStillThere(myOneVersionObservationId);

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

@ -1,5 +1,25 @@
package ca.uhn.fhir.rest.server.interceptor.auth;
/*-
* #%L
* HAPI FHIR - Server Framework
* %%
* Copyright (C) 2014 - 2018 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.RestOperationTypeEnum;
import ca.uhn.fhir.rest.api.server.RequestDetails;
import org.hl7.fhir.instance.model.api.IBaseResource;