honeymoose/hapi-fhir
1
0
Fork 0
mirror of https://github.com/hapifhir/hapi-fhir.git synced 2025-03-03 10:39:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix maven ddl plugin dependency problem on com.sun.xml.bind.v2.ContextFactory by adding a dependency to com.sun.xml.bind. Add more @Audited(NOT_AUDITED) annotations. Build seems to be passing.

Browse Source
This commit is contained in:
Luke deGruchy 2023-02-28 14:02:33 -05:00
parent 35e8f537ad
commit 3464e88be7
9 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -481,6 +481,21 @@
<artifactId>hibernate-core</artifactId>
<version>${hibernate_version}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-envers</artifactId>
<version>${hibernate_version}</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${jaxb_api_version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${jaxb_api_version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>

4
hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceHistoryProvenanceEntity.java
View File

@ -23,6 +23,7 @@ package ca.uhn.fhir.jpa.model.entity;
import ca.uhn.fhir.rest.api.Constants;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import org.hibernate.envers.Audited;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -36,12 +37,15 @@ import javax.persistence.MapsId;
import javax.persistence.OneToOne;
import javax.persistence.Table;
import static org.hibernate.envers.RelationTargetAuditMode.NOT_AUDITED;
@Table(name = "HFJ_RES_VER_PROV", indexes = {
@Index(name = "IDX_RESVERPROV_SOURCEURI", columnList = "SOURCE_URI"),
@Index(name = "IDX_RESVERPROV_REQUESTID", columnList = "REQUEST_ID"),
//@Index(name = "IDX_RESVERPROV_RESID", columnList = "RES_PID")
})
@Entity
@Audited(targetAuditMode = NOT_AUDITED)
public class ResourceHistoryProvenanceEntity extends BasePartitionable {
public static final int SOURCE_URI_LENGTH = 100;

3
hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamQuantityNormalized.java
View File

@ -28,6 +28,7 @@ import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import org.fhir.ucum.Pair;
import org.hibernate.envers.Audited;
import org.hibernate.search.mapper.pojo.mapping.definition.annotation.ScaledNumberField;
import javax.persistence.Column;
@ -48,6 +49,7 @@ import java.util.Objects;
import static org.apache.commons.lang3.StringUtils.defaultString;
import static org.apache.commons.lang3.StringUtils.isBlank;
import static org.hibernate.envers.RelationTargetAuditMode.NOT_AUDITED;
//@formatter:off
@Embeddable
@ -63,6 +65,7 @@ import static org.apache.commons.lang3.StringUtils.isBlank;
* @since 5.3.0
*
*/
@Audited(targetAuditMode = NOT_AUDITED)
public class ResourceIndexedSearchParamQuantityNormalized extends BaseResourceIndexedSearchParamQuantity {
private static final long serialVersionUID = 1L;

3
hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamString.java
View File

@ -30,6 +30,7 @@ import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import org.hibernate.envers.Audited;
import javax.persistence.Column;
import javax.persistence.Embeddable;
@ -45,6 +46,7 @@ import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import static org.apache.commons.lang3.StringUtils.defaultString;
import static org.hibernate.envers.RelationTargetAuditMode.NOT_AUDITED;
//@formatter:off
@Embeddable
@ -64,6 +66,7 @@ import static org.apache.commons.lang3.StringUtils.defaultString;
@Index(name = "IDX_SP_STRING_RESID", columnList = "RES_ID")
})
@Audited(targetAuditMode = NOT_AUDITED)
public class ResourceIndexedSearchParamString extends BaseResourceIndexedSearchParam {
/*

3
hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamToken.java
View File

@ -30,6 +30,7 @@ import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import org.hibernate.envers.Audited;
import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
import javax.persistence.Column;
@ -48,6 +49,7 @@ import javax.persistence.Table;
import static org.apache.commons.lang3.StringUtils.defaultString;
import static org.apache.commons.lang3.StringUtils.trim;
import static org.hibernate.envers.RelationTargetAuditMode.NOT_AUDITED;
@Embeddable
@Entity
@ -66,6 +68,7 @@ import static org.apache.commons.lang3.StringUtils.trim;
@Index(name = "IDX_SP_TOKEN_RESID_V2", columnList = "RES_ID,HASH_SYS_AND_VALUE,HASH_VALUE,HASH_SYS,HASH_IDENTITY,PARTITION_ID")
})
@Audited(targetAuditMode = NOT_AUDITED)
public class ResourceIndexedSearchParamToken extends BaseResourceIndexedSearchParam {
public static final int MAX_LENGTH = 200;

3
hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamUri.java
View File

@ -28,6 +28,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.hibernate.envers.Audited;
import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
import javax.persistence.Column;
@ -45,6 +46,7 @@ import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import static org.apache.commons.lang3.StringUtils.defaultString;
import static org.hibernate.envers.RelationTargetAuditMode.NOT_AUDITED;
@Embeddable
@Entity
@ -56,6 +58,7 @@ import static org.apache.commons.lang3.StringUtils.defaultString;
@Index(name = "IDX_SP_URI_UPDATED", columnList = "SP_UPDATED"),
@Index(name = "IDX_SP_URI_COORDS", columnList = "RES_ID")
})
@Audited(targetAuditMode = NOT_AUDITED)
public class ResourceIndexedSearchParamUri extends BaseResourceIndexedSearchParam {
/*

4
hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceLink.java
View File

@ -23,6 +23,7 @@ package ca.uhn.fhir.jpa.model.entity;
import org.apache.commons.lang3.Validate;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.hibernate.envers.Audited;
import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
import org.hl7.fhir.instance.model.api.IIdType;
@ -44,12 +45,15 @@ import javax.persistence.TemporalType;
import javax.persistence.Transient;
import java.util.Date;
import static org.hibernate.envers.RelationTargetAuditMode.NOT_AUDITED;
@Entity
@Table(name = "HFJ_RES_LINK", indexes = {
@Index(name = "IDX_RL_TPATHRES", columnList = "SRC_PATH,TARGET_RESOURCE_ID"),
@Index(name = "IDX_RL_SRC", columnList = "SRC_RESOURCE_ID"),
@Index(name = "IDX_RL_DEST", columnList = "TARGET_RESOURCE_ID")
})
@Audited(targetAuditMode = NOT_AUDITED)
public class ResourceLink extends BaseResourceIndex {
public static final int SRC_PATH_LENGTH = 500;

4
hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceTag.java
View File

@ -24,6 +24,7 @@ import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import org.hibernate.envers.Audited;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -39,6 +40,8 @@ import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
import static org.hibernate.envers.RelationTargetAuditMode.NOT_AUDITED;
@Entity
@Table(
name = "HFJ_RES_TAG",
@ -48,6 +51,7 @@ import javax.persistence.UniqueConstraint;
},
uniqueConstraints = { @UniqueConstraint(name = "IDX_RESTAG_TAGID", columnNames = {"RES_ID", "TAG_ID"})
})
@Audited(targetAuditMode = NOT_AUDITED)
public class ResourceTag extends BaseTag {
private static final long serialVersionUID = 1L;

4
hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/SearchParamPresentEntity.java
View File

@ -24,16 +24,20 @@ import ca.uhn.fhir.interceptor.model.RequestPartitionId;
import ca.uhn.fhir.jpa.model.config.PartitionSettings;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import org.hibernate.envers.Audited;
import javax.persistence.*;
import java.io.Serializable;
import static org.hibernate.envers.RelationTargetAuditMode.NOT_AUDITED;
@Entity
@Table(name = "HFJ_RES_PARAM_PRESENT", indexes = {
// We used to have a constraint named IDX_RESPARMPRESENT_SPID_RESID - Don't reuse
@Index(name = "IDX_RESPARMPRESENT_RESID", columnList = "RES_ID"),
@Index(name = "IDX_RESPARMPRESENT_HASHPRES", columnList = "HASH_PRESENCE")
})
@Audited(targetAuditMode = NOT_AUDITED)
public class SearchParamPresentEntity extends BasePartitionable implements Serializable {
private static final long serialVersionUID = 1L;