OMRS-131: Detailed Audit Logging

api/pom.xml

@@ -152,6 +152,10 @@
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-search-orm</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-envers</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.lucene</groupId>
 			<artifactId>lucene-queryparser</artifactId>

api/src/main/java/org/openmrs/Allergen.java

@@ -17,6 +17,7 @@
 import javax.persistence.ManyToOne;
 
 import org.apache.commons.lang3.StringUtils;
+import org.hibernate.envers.NotAudited;
 
 /**
  * Represent allergen

api/src/main/java/org/openmrs/Allergy.java

@@ -30,13 +30,16 @@
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;
+import org.hibernate.envers.Audited;
+import org.hibernate.envers.NotAudited;
 import org.openmrs.util.OpenmrsUtil;
 
 /**
  * Represent allergy
  */
 @Entity
 @Table(name = "allergy")
+@Audited
 public class Allergy extends BaseFormRecordableOpenmrsData {
 
 	public static final long serialVersionUID = 1;

api/src/main/java/org/openmrs/AllergyReaction.java

@@ -10,11 +10,14 @@
 package org.openmrs;
 
 import org.apache.commons.lang3.StringUtils;
+import org.hibernate.envers.Audited;
+import org.hibernate.envers.NotAudited;
 import org.openmrs.util.OpenmrsUtil;
 
 /**
  * Represent allergy reactions
  */
+@Audited
 public class AllergyReaction extends BaseOpenmrsObject implements java.io.Serializable{
 
 	public static final long serialVersionUID = 1;

api/src/main/java/org/openmrs/CareSetting.java

@@ -9,6 +9,8 @@
  */
 package org.openmrs;
 
+import org.hibernate.envers.Audited;
+
 /**
  * Care Setting defines the scope of care for any piece of data within the medical record. Clinical
  * data (treatments, notes, etc.) apply within their associated care setting. Implementations
@@ -24,6 +26,7 @@
  * 
  * @since 1.10
  */
+@Audited
 public class CareSetting extends BaseChangeableOpenmrsMetadata {
 
 	public enum CareSettingType {

api/src/main/java/org/openmrs/Cohort.java

@@ -10,6 +10,7 @@
 package org.openmrs;
 
 import org.apache.commons.lang3.StringUtils;
+import org.hibernate.envers.Audited;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -21,6 +22,7 @@
 /**
  * This class represents a list of patientIds.
  */
+@Audited
 public class Cohort extends BaseChangeableOpenmrsData {
 
 	public static final long serialVersionUID = 0L;

api/src/main/java/org/openmrs/CohortMembership.java

@@ -12,11 +12,13 @@
 import java.util.Date;
 import java.util.Objects;
 
+import org.hibernate.envers.Audited;
 import org.openmrs.util.OpenmrsUtil;
 
 /**
  * @since 2.1.0
  */
+@Audited
 public class CohortMembership extends BaseChangeableOpenmrsData implements Comparable<CohortMembership> {
 
 	public static final long serialVersionUID = 0L;

api/src/main/java/org/openmrs/Concept.java

@@ -26,6 +26,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.codehaus.jackson.annotate.JsonIgnore;
+import org.hibernate.envers.Audited;
 import org.hibernate.search.annotations.ContainedIn;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
@@ -69,6 +70,7 @@
  * @see ConceptService
  */
 @FullTextFilterDefs( { @FullTextFilterDef(name = "termsFilterFactory", impl = TermsFilterFactory.class) })
+@Audited
 public class Concept extends BaseOpenmrsObject implements Auditable, Retireable, Serializable, Attributable<Concept>,Customizable<ConceptAttribute> {
 
 	public static final long serialVersionUID = 57332L;

api/src/main/java/org/openmrs/ConceptAnswer.java

@@ -9,6 +9,8 @@
  */
 package org.openmrs;
 
+import org.hibernate.envers.Audited;
+
 import java.util.Date;
 
 /**
@@ -18,6 +20,7 @@
  *
  * @see Concept#getAnswers()
  */
+@Audited
 public class ConceptAnswer extends BaseOpenmrsObject implements Auditable, java.io.Serializable, Comparable<ConceptAnswer> {
 
 	public static final long serialVersionUID = 3744L;

api/src/main/java/org/openmrs/ConceptAttribute.java

@@ -9,9 +9,11 @@
  */
 package org.openmrs;
 
+import org.hibernate.envers.Audited;
 import org.openmrs.attribute.Attribute;
 import org.openmrs.attribute.BaseAttribute;
 
+@Audited
 public class ConceptAttribute extends BaseAttribute<ConceptAttributeType, Concept> implements Attribute<ConceptAttributeType, Concept> {
 
 	private Integer conceptAttributeId;

api/src/main/java/org/openmrs/ConceptClass.java

@@ -9,11 +9,13 @@
  */
 package org.openmrs;
 
+import org.hibernate.envers.Audited;
 import org.hibernate.search.annotations.DocumentId;
 
 /**
  * ConceptClass
  */
+@Audited
 public class ConceptClass extends BaseChangeableOpenmrsMetadata {
 
 	public static final long serialVersionUID = 33473L;

api/src/main/java/org/openmrs/ConceptComplex.java

@@ -9,6 +9,7 @@
  */
 package org.openmrs;
 
+import org.hibernate.envers.Audited;
 import org.hibernate.search.annotations.Indexed;
 import org.openmrs.obs.ComplexObsHandler;
 
@@ -18,6 +19,7 @@
  * @since 1.5
  */
 @Indexed
+@Audited
 public class ConceptComplex extends Concept {
 
 	public static final long serialVersionUID = 473231233L;

api/src/main/java/org/openmrs/ConceptDatatype.java

@@ -9,11 +9,13 @@
  */
 package org.openmrs;
 
+import org.hibernate.envers.Audited;
 import org.hibernate.search.annotations.DocumentId;
 
 /**
  * ConceptDatatype
  */
+@Audited
 public class ConceptDatatype extends BaseChangeableOpenmrsMetadata {
 
 	public static final long serialVersionUID = 473L;

api/src/main/java/org/openmrs/ConceptDescription.java

@@ -9,12 +9,15 @@
  */
 package org.openmrs;
 
+import org.hibernate.envers.Audited;
+
 import java.util.Date;
 import java.util.Locale;
 
 /**
  * ConceptDescription is the localized description of a concept.
  */
+@Audited
 public class ConceptDescription extends BaseOpenmrsObject implements Auditable, java.io.Serializable {
 
 	private static final long serialVersionUID = -7223075113369136584L;

api/src/main/java/org/openmrs/ConceptMap.java

@@ -9,6 +9,7 @@
  */
 package org.openmrs;
 
+import org.hibernate.envers.Audited;
 import org.hibernate.search.annotations.ContainedIn;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.IndexedEmbedded;
@@ -17,6 +18,7 @@
  * The concept map object represents a mapping of Concept to ConceptSource. A concept can have 0 to
  * N mappings to any and all concept sources in the database.
  */
+@Audited
 public class ConceptMap extends BaseConceptMap {
 
 	public static final long serialVersionUID = 754677L;

api/src/main/java/org/openmrs/ConceptMapType.java

@@ -10,6 +10,7 @@
 package org.openmrs;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
+import org.hibernate.envers.Audited;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -26,6 +27,7 @@
  */
 @Entity
 @Table(name = "concept_map_type")
+@Audited
 public class ConceptMapType extends BaseChangeableOpenmrsMetadata {
 
 	private static final long serialVersionUID = 1L;

api/src/main/java/org/openmrs/ConceptName.java

@@ -20,6 +20,7 @@
 import org.apache.lucene.analysis.standard.StandardFilterFactory;
 import org.apache.lucene.analysis.standard.StandardTokenizerFactory;
 import org.codehaus.jackson.annotate.JsonIgnore;
+import org.hibernate.envers.Audited;
 import org.hibernate.search.annotations.Analyze;
 import org.hibernate.search.annotations.Analyzer;
 import org.hibernate.search.annotations.AnalyzerDef;
@@ -45,6 +46,7 @@
 		@TokenFilterDef(factory = ASCIIFoldingFilterFactory.class)
 	})
 @Analyzer(definition = "ConceptNameAnalyzer")
+@Audited
 public class ConceptName extends BaseOpenmrsObject implements Auditable, Voidable, java.io.Serializable {
 
 	public static final long serialVersionUID = 2L;

api/src/main/java/org/openmrs/ConceptNameTag.java

@@ -12,10 +12,12 @@
 import java.util.Date;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
+import org.hibernate.envers.Audited;
 
 /**
  * ConceptNameTag is a textual tag which can be applied to a ConceptName.
  */
+@Audited
 public class ConceptNameTag extends BaseOpenmrsObject implements Auditable, Voidable, java.io.Serializable {
 
 	public static final long serialVersionUID = 33226787L;

api/src/main/java/org/openmrs/ConceptReferenceTerm.java

@@ -12,6 +12,7 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
+import org.hibernate.envers.Audited;
 import org.hibernate.search.annotations.Analyze;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
@@ -23,6 +24,7 @@
  *
  * @since 1.9
  */
+@Audited
 public class ConceptReferenceTerm extends BaseChangeableOpenmrsMetadata {
 
 	private static final long serialVersionUID = 1L;

api/src/main/java/org/openmrs/ConceptReferenceTermMap.java

@@ -9,13 +9,16 @@
  */
 package org.openmrs;
 
+import org.hibernate.envers.Audited;
+
 /**
  * The concept Reference Term map object represents a mapping between two Concept Reference Terms. A
  * concept reference term can have 0 to N concept reference term mappings to any or all Concept
  * Reference Terms
  *
  * @since 1.9
  */
+@Audited
 public class ConceptReferenceTermMap extends BaseConceptMap {
 
 	private static final long serialVersionUID = 1L;

api/src/main/java/org/openmrs/ConceptSet.java

@@ -11,11 +11,13 @@
 
 import java.util.Date;
 
+import org.hibernate.envers.Audited;
 import org.openmrs.util.OpenmrsUtil;
 
 /**
  * This represents a single concept within a concept set.
  */
+@Audited
 public class ConceptSet extends BaseOpenmrsObject implements Auditable, java.io.Serializable, Comparable<ConceptSet> {
 
 	public static final long serialVersionUID = 3787L;

api/src/main/java/org/openmrs/ConceptSource.java

@@ -9,12 +9,15 @@
  */
 package org.openmrs;
 
+import org.hibernate.envers.Audited;
+
 import java.util.Date;
 
 /**
  * A concept source is defined as any institution that keeps a concept dictionary. Examples are
  * ICD9, ICD10, SNOMED, or any other OpenMRS implementation
  */
+@Audited
 public class ConceptSource extends BaseChangeableOpenmrsMetadata {
 
 	public static final long serialVersionUID = 375L;

api/src/main/java/org/openmrs/Condition.java

@@ -9,6 +9,8 @@
  */
 package org.openmrs;
 
+import org.hibernate.envers.Audited;
+import org.hibernate.envers.NotAudited;
 import org.openmrs.util.OpenmrsUtil;
 
 import javax.persistence.AssociationOverride;
@@ -40,6 +42,7 @@
  */
 @Entity
 @Table(name = "conditions")
+@Audited
 public class Condition extends BaseFormRecordableOpenmrsData {
 
 	private static final long serialVersionUID = 1L;

api/src/main/java/org/openmrs/Diagnosis.java

@@ -10,6 +10,8 @@
 package org.openmrs;
 
 import org.hibernate.annotations.BatchSize;
+import org.hibernate.envers.Audited;
+import org.hibernate.envers.NotAudited;
 
 import javax.persistence.Access;
 import javax.persistence.AccessType;
@@ -44,6 +46,7 @@
  */
 @Entity
 @Table(name = "encounter_diagnosis")
+@Audited
 public class Diagnosis extends BaseCustomizableData<DiagnosisAttribute> implements FormRecordable {
 
 	private static final long serialVersionUID = 1L;

api/src/main/java/org/openmrs/DiagnosisAttribute.java

@@ -9,6 +9,7 @@
  */
 package org.openmrs;
 
+import org.hibernate.envers.Audited;
 import org.openmrs.attribute.Attribute;
 import org.openmrs.attribute.BaseAttribute;
 
@@ -17,6 +18,7 @@
  * @see Attribute
  * @since 2.5.0
  */
+@Audited
 public class DiagnosisAttribute extends BaseAttribute<DiagnosisAttributeType, Diagnosis> implements Attribute<DiagnosisAttributeType, Diagnosis> {
 
 	private Integer diagnosisAttributeId;

api/src/main/java/org/openmrs/DiagnosisAttributeType.java

@@ -9,6 +9,7 @@
  */
 package org.openmrs;
 
+import org.hibernate.envers.Audited;
 import org.openmrs.attribute.AttributeType;
 import org.openmrs.attribute.BaseAttributeType;
 
@@ -17,6 +18,7 @@
  * @see AttributeType
  * @since 2.5.0
  */
+@Audited
 public class DiagnosisAttributeType extends BaseAttributeType<Diagnosis> implements AttributeType<Diagnosis> {
 
 	private Integer diagnosisAttributeTypeId;