diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/MdmLink.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/MdmLink.java index bd61da4f24c..9c8e4e40b61 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/MdmLink.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/MdmLink.java @@ -28,6 +28,7 @@ import ca.uhn.fhir.mdm.api.MdmLinkSourceEnum; import ca.uhn.fhir.mdm.api.MdmMatchResultEnum; import org.apache.commons.lang3.builder.ToStringBuilder; import org.hibernate.envers.Audited; +import org.hibernate.envers.NotAudited; import javax.persistence.Column; import javax.persistence.Entity; @@ -73,6 +74,7 @@ public class MdmLink extends BasePartitionable implements IMdmLink { @ManyToOne(optional = false, fetch = FetchType.LAZY, cascade = {}) @JoinColumn(name = "GOLDEN_RESOURCE_PID", referencedColumnName = "RES_ID", foreignKey = @ForeignKey(name = "FK_EMPI_LINK_GOLDEN_RESOURCE"), insertable=false, updatable=false, nullable=false) + @NotAudited private ResourceTable myGoldenResource; @Column(name = "GOLDEN_RESOURCE_PID", nullable=false) @@ -81,6 +83,7 @@ public class MdmLink extends BasePartitionable implements IMdmLink { @Deprecated @ManyToOne(optional = false, fetch = FetchType.LAZY, cascade = {}) @JoinColumn(name = "PERSON_PID", referencedColumnName = "RES_ID", foreignKey = @ForeignKey(name = "FK_EMPI_LINK_PERSON"), insertable=false, updatable=false, nullable=false) + @NotAudited private ResourceTable myPerson; @Deprecated @@ -89,6 +92,7 @@ public class MdmLink extends BasePartitionable implements IMdmLink { @ManyToOne(optional = false, fetch = FetchType.LAZY, cascade = {}) @JoinColumn(name = "TARGET_PID", referencedColumnName = "RES_ID", foreignKey = @ForeignKey(name = "FK_EMPI_LINK_TARGET"), insertable=false, updatable=false, nullable=false) + @NotAudited private ResourceTable mySource; @Column(name = "TARGET_PID", updatable=false, nullable=false) diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedComboStringUnique.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedComboStringUnique.java index a4d6e460793..0dddcce7738 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedComboStringUnique.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedComboStringUnique.java @@ -38,7 +38,7 @@ import static org.hibernate.envers.RelationTargetAuditMode.NOT_AUDITED; @Index(name = ResourceIndexedComboStringUnique.IDX_IDXCMPSTRUNIQ_STRING, columnList = "IDX_STRING", unique = true), @Index(name = ResourceIndexedComboStringUnique.IDX_IDXCMPSTRUNIQ_RESOURCE, columnList = "RES_ID", unique = false) }) -@Audited(targetAuditMode = NOT_AUDITED) +//@Audited(targetAuditMode = NOT_AUDITED) public class ResourceIndexedComboStringUnique extends BasePartitionable implements Comparable, IResourceIndexComboSearchParameter { public static final int MAX_STRING_LENGTH = 500; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedComboTokenNonUnique.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedComboTokenNonUnique.java index f804a65579d..7b298986035 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedComboTokenNonUnique.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedComboTokenNonUnique.java @@ -51,7 +51,7 @@ import static org.hibernate.envers.RelationTargetAuditMode.NOT_AUDITED; @Index(name = "IDX_IDXCMBTOKNU_STR", columnList = "IDX_STRING", unique = false), @Index(name = "IDX_IDXCMBTOKNU_RES", columnList = "RES_ID", unique = false) }) -@Audited(targetAuditMode = NOT_AUDITED) +//@Audited(targetAuditMode = NOT_AUDITED) public class ResourceIndexedComboTokenNonUnique extends BaseResourceIndex implements Comparable, IResourceIndexComboSearchParameter { @SequenceGenerator(name = "SEQ_IDXCMBTOKNU_ID", sequenceName = "SEQ_IDXCMBTOKNU_ID") diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamCoords.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamCoords.java index 82eec40fafb..401285a9ade 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamCoords.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamCoords.java @@ -51,7 +51,7 @@ import static org.hibernate.envers.RelationTargetAuditMode.NOT_AUDITED; @Index(name = "IDX_SP_COORDS_UPDATED", columnList = "SP_UPDATED"), @Index(name = "IDX_SP_COORDS_RESID", columnList = "RES_ID") }) -@Audited(targetAuditMode = NOT_AUDITED) +//@Audited(targetAuditMode = NOT_AUDITED) public class ResourceIndexedSearchParamCoords extends BaseResourceIndexedSearchParam { public static final int MAX_LENGTH = 100; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamDate.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamDate.java index 89876be293f..d34c5b31a67 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamDate.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamDate.java @@ -70,7 +70,7 @@ import static org.hibernate.envers.RelationTargetAuditMode.NOT_AUDITED; @Index(name = "IDX_SP_DATE_ORD_HASH_HIGH_V2", columnList = "HASH_IDENTITY,SP_VALUE_HIGH_DATE_ORDINAL,RES_ID,PARTITION_ID"), @Index(name = "IDX_SP_DATE_RESID_V2", columnList = "RES_ID,HASH_IDENTITY,SP_VALUE_LOW,SP_VALUE_HIGH,SP_VALUE_LOW_DATE_ORDINAL,SP_VALUE_HIGH_DATE_ORDINAL,PARTITION_ID"), }) -@Audited(targetAuditMode = NOT_AUDITED) +//@Audited(targetAuditMode = NOT_AUDITED) public class ResourceIndexedSearchParamDate extends BaseResourceIndexedSearchParam { private static final long serialVersionUID = 1L; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamNumber.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamNumber.java index fa09a2fdc8f..2436aab4364 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamNumber.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamNumber.java @@ -55,7 +55,7 @@ import static org.hibernate.envers.RelationTargetAuditMode.NOT_AUDITED; @Index(name = "IDX_SP_NUMBER_HASH_VAL_V2", columnList = "HASH_IDENTITY,SP_VALUE,RES_ID,PARTITION_ID"), @Index(name = "IDX_SP_NUMBER_RESID_V2", columnList = "RES_ID, HASH_IDENTITY, SP_VALUE, PARTITION_ID") }) -@Audited(targetAuditMode = NOT_AUDITED) +//@Audited(targetAuditMode = NOT_AUDITED) public class ResourceIndexedSearchParamNumber extends BaseResourceIndexedSearchParam { private static final long serialVersionUID = 1L; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamQuantity.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamQuantity.java index 3b4c4556703..3441affeba0 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamQuantity.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamQuantity.java @@ -59,7 +59,7 @@ import static org.hibernate.envers.RelationTargetAuditMode.NOT_AUDITED; @Index(name = "IDX_SP_QUANTITY_HASH_SYSUN_V2", columnList = "HASH_IDENTITY_SYS_UNITS,SP_VALUE,RES_ID,PARTITION_ID"), @Index(name = "IDX_SP_QUANTITY_RESID_V2", columnList = "RES_ID,HASH_IDENTITY,HASH_IDENTITY_SYS_UNITS,HASH_IDENTITY_AND_UNITS,SP_VALUE,PARTITION_ID") }) -@Audited(targetAuditMode = NOT_AUDITED) +//@Audited(targetAuditMode = NOT_AUDITED) public class ResourceIndexedSearchParamQuantity extends BaseResourceIndexedSearchParamQuantity { private static final long serialVersionUID = 1L; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamQuantityNormalized.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamQuantityNormalized.java index 1fd5b32c22e..e0bb07ee416 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamQuantityNormalized.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamQuantityNormalized.java @@ -65,7 +65,7 @@ import static org.hibernate.envers.RelationTargetAuditMode.NOT_AUDITED; * @since 5.3.0 * */ -@Audited(targetAuditMode = NOT_AUDITED) +//@Audited(targetAuditMode = NOT_AUDITED) public class ResourceIndexedSearchParamQuantityNormalized extends BaseResourceIndexedSearchParamQuantity { private static final long serialVersionUID = 1L; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamString.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamString.java index 3199a3502db..955d6115fbb 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamString.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamString.java @@ -66,7 +66,7 @@ import static org.hibernate.envers.RelationTargetAuditMode.NOT_AUDITED; @Index(name = "IDX_SP_STRING_RESID", columnList = "RES_ID") }) -@Audited(targetAuditMode = NOT_AUDITED) +//@Audited(targetAuditMode = NOT_AUDITED) public class ResourceIndexedSearchParamString extends BaseResourceIndexedSearchParam { /* diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamToken.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamToken.java index 31f8228dcb3..f022deb5c46 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamToken.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamToken.java @@ -68,7 +68,7 @@ import static org.hibernate.envers.RelationTargetAuditMode.NOT_AUDITED; @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) +//@Audited(targetAuditMode = NOT_AUDITED) public class ResourceIndexedSearchParamToken extends BaseResourceIndexedSearchParam { public static final int MAX_LENGTH = 200; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamUri.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamUri.java index 32d4664645c..a64e911c454 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamUri.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamUri.java @@ -58,7 +58,7 @@ import static org.hibernate.envers.RelationTargetAuditMode.NOT_AUDITED; @Index(name = "IDX_SP_URI_UPDATED", columnList = "SP_UPDATED"), @Index(name = "IDX_SP_URI_COORDS", columnList = "RES_ID") }) -@Audited(targetAuditMode = NOT_AUDITED) +//@Audited(targetAuditMode = NOT_AUDITED) public class ResourceIndexedSearchParamUri extends BaseResourceIndexedSearchParam { /* diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceLink.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceLink.java index 81822f33831..e21a0212336 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceLink.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceLink.java @@ -53,7 +53,7 @@ import static org.hibernate.envers.RelationTargetAuditMode.NOT_AUDITED; @Index(name = "IDX_RL_SRC", columnList = "SRC_RESOURCE_ID"), @Index(name = "IDX_RL_DEST", columnList = "TARGET_RESOURCE_ID") }) -@Audited(targetAuditMode = NOT_AUDITED) +//@Audited(targetAuditMode = NOT_AUDITED) public class ResourceLink extends BaseResourceIndex { public static final int SRC_PATH_LENGTH = 500; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceTable.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceTable.java index 956bee5f5ea..e4d1f6f668b 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceTable.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceTable.java @@ -38,6 +38,7 @@ import org.hibernate.annotations.GenerationTime; import org.hibernate.annotations.GeneratorType; import org.hibernate.annotations.OptimisticLock; import org.hibernate.envers.Audited; +import org.hibernate.envers.NotAudited; import org.hibernate.search.engine.backend.types.Projectable; import org.hibernate.search.engine.backend.types.Searchable; import org.hibernate.search.mapper.pojo.bridge.mapping.annotation.PropertyBinderRef; @@ -87,7 +88,7 @@ import static org.hibernate.envers.RelationTargetAuditMode.NOT_AUDITED; @Index(name = "IDX_RES_TYPE_DEL_UPDATED", columnList = "RES_TYPE,RES_DELETED_AT,RES_UPDATED,PARTITION_ID,RES_ID"), }) @NamedEntityGraph(name = "Resource.noJoins") -@Audited(targetAuditMode = NOT_AUDITED) +//@Audited(targetAuditMode = NOT_AUDITED) public class ResourceTable extends BaseHasResource implements Serializable, IBasePersistedResource { public static final int RESTYPE_LEN = 40; private static final int MAX_LANGUAGE_LENGTH = 20; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceTag.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceTag.java index 59da20c9def..c9b83bd80cb 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceTag.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceTag.java @@ -51,7 +51,7 @@ import static org.hibernate.envers.RelationTargetAuditMode.NOT_AUDITED; }, uniqueConstraints = { @UniqueConstraint(name = "IDX_RESTAG_TAGID", columnNames = {"RES_ID", "TAG_ID"}) }) -@Audited(targetAuditMode = NOT_AUDITED) +//@Audited(targetAuditMode = NOT_AUDITED) public class ResourceTag extends BaseTag { private static final long serialVersionUID = 1L; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/SearchParamPresentEntity.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/SearchParamPresentEntity.java index 47a054bc97d..7ce5f7bde95 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/SearchParamPresentEntity.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/SearchParamPresentEntity.java @@ -37,7 +37,7 @@ import static org.hibernate.envers.RelationTargetAuditMode.NOT_AUDITED; @Index(name = "IDX_RESPARMPRESENT_RESID", columnList = "RES_ID"), @Index(name = "IDX_RESPARMPRESENT_HASHPRES", columnList = "HASH_PRESENCE") }) -@Audited(targetAuditMode = NOT_AUDITED) +//@Audited(targetAuditMode = NOT_AUDITED) public class SearchParamPresentEntity extends BasePartitionable implements Serializable { private static final long serialVersionUID = 1L;