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

Work on 2.1 structures

This commit is contained in:
James Agnew 2015-12-10 08:24:12 -05:00
parent 2f8278ff78
commit 85ec9d9264
33 changed files with 296 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,25 @@
package ca.uhn.fhir.rest.client.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.ByteArrayOutputStream;
import java.io.IOException;
import java.util.zip.GZIPOutputStream;

4
hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/gclient/IDelete.java
View File

@ -3,8 +3,6 @@ package ca.uhn.fhir.rest.gclient;
import org.hl7.fhir.instance.model.api.IBaseResource;
import org.hl7.fhir.instance.model.api.IIdType;
import ca.uhn.fhir.model.api.IResource;
/*
* #%L
* HAPI FHIR - Core Library
@ -27,7 +25,7 @@ import ca.uhn.fhir.model.api.IResource;
public interface IDelete {
IDeleteTyped resource(IResource theResource);
IDeleteTyped resource(IBaseResource theResource);
IDeleteTyped resourceById(IIdType theId);

20
hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsConformanceProvider.java
View File

@ -1,5 +1,25 @@
package ca.uhn.fhir.jaxrs.server;
/*
* #%L
* HAPI FHIR JAX-RS Server
* %%
* 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 java.lang.annotation.Annotation;
import java.lang.reflect.Method;

20
hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsPageProvider.java
View File

@ -1,5 +1,25 @@
package ca.uhn.fhir.jaxrs.server;
/*
* #%L
* HAPI FHIR JAX-RS Server
* %%
* 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 java.util.Collections;
import java.util.List;

20
hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsProvider.java
View File

@ -1,5 +1,25 @@
package ca.uhn.fhir.jaxrs.server;
/*
* #%L
* HAPI FHIR JAX-RS Server
* %%
* 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.util.HashMap;
import java.util.List;
import java.util.Map;

20
hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsResourceProvider.java
View File

@ -1,5 +1,25 @@
package ca.uhn.fhir.jaxrs.server;
/*
* #%L
* HAPI FHIR JAX-RS Server
* %%
* 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 java.net.URL;
import java.util.Collections;

20
hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/interceptor/JaxRsExceptionInterceptor.java
View File

@ -1,5 +1,25 @@
package ca.uhn.fhir.jaxrs.server.interceptor;
/*
* #%L
* HAPI FHIR JAX-RS Server
* %%
* 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.interceptor.AroundInvoke;

20
hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/interceptor/JaxRsResponseException.java
View File

@ -1,5 +1,25 @@
package ca.uhn.fhir.jaxrs.server.interceptor;
/*
* #%L
* HAPI FHIR JAX-RS Server
* %%
* 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 javax.ejb.ApplicationException;
import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException;

20
hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/util/JaxRsMethodBindings.java
View File

@ -1,5 +1,25 @@
package ca.uhn.fhir.jaxrs.server.util;
/*
* #%L
* HAPI FHIR JAX-RS Server
* %%
* 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.lang.reflect.Method;
import java.util.concurrent.ConcurrentHashMap;

20
hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/util/JaxRsRequest.java
View File

@ -1,5 +1,25 @@
package ca.uhn.fhir.jaxrs.server.util;
/*
* #%L
* HAPI FHIR JAX-RS Server
* %%
* 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 java.io.InputStream;
import java.io.Reader;

20
hapi-fhir-jaxrsserver-base/src/main/java/ca/uhn/fhir/jaxrs/server/util/JaxRsResponse.java
View File

@ -1,5 +1,25 @@
package ca.uhn.fhir.jaxrs.server.util;
/*
* #%L
* HAPI FHIR JAX-RS Server
* %%
* 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 java.io.StringWriter;
import java.io.UnsupportedEncodingException;

12
hapi-fhir-jpaserver-base/pom.xml
View File

@ -436,6 +436,7 @@
<skip-hib4>true</skip-hib4>
</properties>
</profile>
<!--
<profile>
<id>DIST</id>
<build>
@ -448,9 +449,13 @@
<target>SCRIPT</target>
<skip>${skip-hib4}</skip>
</configuration>
<!-- This needs to be uncommented in order for this plugin to work with Hibernate 4.3+ (as of hibernate4-maven-plugin version 1.0.5) -->
<dependencies> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId>
<version>${hibernate_version}</version> </dependency> </dependencies>
<dependencies>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>${hibernate_version}</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>o10g</id>
@ -501,6 +506,7 @@
</plugins>
</build>
</profile>
-->
</profiles>
</project>

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

@ -1079,13 +1079,15 @@ public abstract class BaseHapiFhirDao<T extends IBaseResource> implements IDao {
return retVal;
}
protected IBaseResource toResource(BaseHasResource theEntity, boolean theForHistoryOperation) {
@Override
public IBaseResource toResource(BaseHasResource theEntity, boolean theForHistoryOperation) {
RuntimeResourceDefinition type = myContext.getResourceDefinition(theEntity.getResourceType());
return toResource(type.getImplementingClass(), theEntity, theForHistoryOperation);
}
@Override
@SuppressWarnings("unchecked")
protected <R extends IBaseResource> R toResource(Class<R> theResourceType, BaseHasResource theEntity, boolean theForHistoryOperation) {
public <R extends IBaseResource> R toResource(Class<R> theResourceType, BaseHasResource theEntity, boolean theForHistoryOperation) {
String resourceText = null;
switch (theEntity.getEncoding()) {
case JSON:

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

@ -33,10 +33,7 @@ import java.util.Map.Entry;
import java.util.Set;
import javax.annotation.PostConstruct;
import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceContextType;
import javax.persistence.TemporalType;
import javax.persistence.TypedQuery;
@ -97,9 +94,6 @@ public abstract class BaseHapiFhirResourceDao<T extends IResource> extends BaseH
@Autowired
private DaoConfig myDaoConfig;
@PersistenceContext(type = PersistenceContextType.TRANSACTION)
protected EntityManager myEntityManager;
@Autowired
protected PlatformTransactionManager myPlatformTransactionManager;

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

@ -1,5 +1,25 @@
package ca.uhn.fhir.jpa.dao;
/*
* #%L
* HAPI FHIR JPA Server
* %%
* 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 static org.apache.commons.lang3.StringUtils.isNotBlank;
import java.util.ArrayList;

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

@ -1,5 +1,8 @@
package ca.uhn.fhir.jpa.dao;
import org.hl7.fhir.instance.model.api.IBaseResource;
import ca.uhn.fhir.jpa.entity.BaseHasResource;
import ca.uhn.fhir.model.api.IResource;
import ca.uhn.fhir.model.api.ResourceMetadataKeyEnum;
@ -40,5 +43,9 @@ public interface IDao {
}
};
IBaseResource toResource(BaseHasResource theEntity, boolean theForHistoryOperation);
<R extends IBaseResource> R toResource(Class<R> theResourceType, BaseHasResource theEntity, boolean theForHistoryOperation);
}

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

@ -1,5 +1,25 @@
package ca.uhn.fhir.jpa.provider;
/*
* #%L
* HAPI FHIR JPA Server
* %%
* 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.util.ArrayList;
import java.util.HashMap;
import java.util.List;

20
hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/rest/server/provider/ServerConformanceProvider.java
View File

@ -1,5 +1,25 @@
package ca.uhn.fhir.rest.server.provider;
/*
* #%L
* HAPI FHIR Structures - DSTU1 (FHIR v0.80)
* %%
* 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.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;

2
hapi-fhir-structures-dstu2.1/src/main/java/ca/uhn/fhir/model/dstu21/FhirDstu21.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.model.dstu21;
/*
* #%L
* HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
* HAPI FHIR Structures - DSTU2.1 (FHIR v1.1.x)
* %%
* Copyright (C) 2014 - 2015 University Health Network
* %%

2
hapi-fhir-structures-dstu2.1/src/main/java/ca/uhn/fhir/model/dstu21/composite/AgeDt.java
View File

@ -6,7 +6,7 @@ import ca.uhn.fhir.model.primitive.IntegerDt;
/*
* #%L
* HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
* HAPI FHIR Structures - DSTU2.1 (FHIR v1.1.x)
* %%
* Copyright (C) 2014 - 2015 University Health Network
* %%

2
hapi-fhir-structures-dstu2.1/src/main/java/ca/uhn/fhir/model/dstu21/composite/BoundCodeableConceptDt.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.model.dstu21.composite;
/*
* #%L
* HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
* HAPI FHIR Structures - DSTU2.1 (FHIR v1.1.x)
* %%
* Copyright (C) 2014 - 2015 University Health Network
* %%

2
hapi-fhir-structures-dstu2.1/src/main/java/ca/uhn/fhir/model/dstu21/composite/ContainedDt.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.model.dstu21.composite;
/*
* #%L
* HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
* HAPI FHIR Structures - DSTU2.1 (FHIR v1.1.x)
* %%
* Copyright (C) 2014 - 2015 University Health Network
* %%

2
hapi-fhir-structures-dstu2.1/src/main/java/ca/uhn/fhir/model/dstu21/composite/CountDt.java
View File

@ -5,7 +5,7 @@ import ca.uhn.fhir.model.dstu21.composite.QuantityDt;
/*
* #%L
* HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
* HAPI FHIR Structures - DSTU2.1 (FHIR v1.1.x)
* %%
* Copyright (C) 2014 - 2015 University Health Network
* %%

2
hapi-fhir-structures-dstu2.1/src/main/java/ca/uhn/fhir/model/dstu21/composite/DistanceDt.java
View File

@ -6,7 +6,7 @@ import ca.uhn.fhir.model.primitive.IntegerDt;
/*
* #%L
* HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
* HAPI FHIR Structures - DSTU2.1 (FHIR v1.1.x)
* %%
* Copyright (C) 2014 - 2015 University Health Network
* %%

2
hapi-fhir-structures-dstu2.1/src/main/java/ca/uhn/fhir/model/dstu21/composite/DurationDt.java
View File

@ -5,7 +5,7 @@ import ca.uhn.fhir.model.dstu21.composite.QuantityDt;
/*
* #%L
* HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
* HAPI FHIR Structures - DSTU2.1 (FHIR v1.1.x)
* %%
* Copyright (C) 2014 - 2015 University Health Network
* %%

2
hapi-fhir-structures-dstu2.1/src/main/java/ca/uhn/fhir/model/dstu21/composite/MoneyDt.java
View File

@ -5,7 +5,7 @@ import ca.uhn.fhir.model.dstu21.composite.QuantityDt;
/*
* #%L
* HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
* HAPI FHIR Structures - DSTU2.1 (FHIR v1.1.x)
* %%
* Copyright (C) 2014 - 2015 University Health Network
* %%

2
hapi-fhir-structures-dstu2.1/src/main/java/ca/uhn/fhir/model/dstu21/composite/NarrativeDt.java
View File

@ -18,7 +18,7 @@ package ca.uhn.fhir.model.dstu21.composite;
/*
* #%L
* HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
* HAPI FHIR Structures - DSTU2.1 (FHIR v1.1.x)
* %%
* Copyright (C) 2014 - 2015 University Health Network
* %%

2
hapi-fhir-structures-dstu2.1/src/main/java/ca/uhn/fhir/model/dstu21/composite/ResourceReferenceDt.java
View File

@ -18,7 +18,7 @@ package ca.uhn.fhir.model.dstu21.composite;
/*
* #%L
* HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
* HAPI FHIR Structures - DSTU2.1 (FHIR v1.1.x)
* %%
* Copyright (C) 2014 - 2015 University Health Network
* %%

2
hapi-fhir-structures-dstu2.1/src/main/java/ca/uhn/fhir/model/dstu21/composite/SimpleQuantityDt.java
View File

@ -7,7 +7,7 @@ import ca.uhn.fhir.model.dstu21.valueset.QuantityComparatorEnum;
/*
* #%L
* HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
* HAPI FHIR Structures - DSTU2.1 (FHIR v1.1.x)
* %%
* Copyright (C) 2014 - 2015 University Health Network
* %%

2
hapi-fhir-structures-dstu2.1/src/main/java/ca/uhn/fhir/model/dstu21/resource/BaseResource.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.model.dstu21.resource;
/*
* #%L
* HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
* HAPI FHIR Structures - DSTU2.1 (FHIR v1.1.x)
* %%
* Copyright (C) 2014 - 2015 University Health Network
* %%

2
hapi-fhir-structures-dstu2.1/src/main/java/ca/uhn/fhir/rest/server/provider/dstu21/Dstu21BundleFactory.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.server.provider.dstu21;
/*
* #%L
* HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
* HAPI FHIR Structures - DSTU2.1 (FHIR v1.1.x)
* %%
* Copyright (C) 2014 - 2015 University Health Network
* %%

2
hapi-fhir-structures-dstu2.1/src/main/java/ca/uhn/fhir/rest/server/provider/dstu21/ServerConformanceProvider.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.server.provider.dstu21;
/*
* #%L
* HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
* HAPI FHIR Structures - DSTU2.1 (FHIR v1.1.x)
* %%
* Copyright (C) 2014 - 2015 University Health Network
* %%

2
hapi-fhir-structures-dstu2.1/src/main/java/ca/uhn/fhir/rest/server/provider/dstu21/ServerProfileProvider.java
View File

@ -2,7 +2,7 @@ package ca.uhn.fhir.rest.server.provider.dstu21;
/*
* #%L
* HAPI FHIR Structures - DSTU2 (FHIR v1.0.0)
* HAPI FHIR Structures - DSTU2.1 (FHIR v1.1.x)
* %%
* Copyright (C) 2014 - 2015 University Health Network
* %%