Trunk 5922: Switching from Hibernate Mappings to Annotations for DrugReferenceMap Domain

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

@@ -9,48 +9,83 @@
  */
 package org.openmrs;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 import java.io.Serializable;
 import java.util.Date;
 
+import org.hibernate.annotations.Cascade;
+import org.hibernate.annotations.Parameter;
+import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.envers.Audited;
 import org.hibernate.search.annotations.ContainedIn;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.IndexedEmbedded;
+import org.hibernate.annotations.CascadeType;
 
 /**
  * The DrugReferenceMap map object represents a mapping between a drug and alternative drug
  * terminologies.
- * 
+ *
  * @since 1.10
  */
+@Entity
+@Table(name="drug_reference_map")
 @Audited
 public class DrugReferenceMap extends BaseOpenmrsObject implements Auditable, Serializable {
-	
+
 	public static final long serialVersionUID = 1L;
-
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "drug_reference_map_id_seq")
+	@GenericGenerator(
+		name = "drug_reference_map_id_seq",
+		strategy = "native",
+		parameters = @Parameter(name = "sequence", value = "drug_reference_map_drug_reference_map_id_seq")
+	)
 	@DocumentId
+	@Column(name = "drug_reference_map_id")
 	private Integer drugReferenceMapId;
-
+
+	@ManyToOne
+	@JoinColumn(name = "drug_id", nullable = false)
 	@ContainedIn
 	private Drug drug;
-
+
+	@ManyToOne
+	@JoinColumn(name = "term_id", nullable = false)
+	@Cascade(CascadeType.SAVE_UPDATE)
 	@IndexedEmbedded(includeEmbeddedObjectId = true)
 	private ConceptReferenceTerm conceptReferenceTerm;
-
+
+	@ManyToOne
+	@JoinColumn(name = "concept_map_type", nullable = false)
 	private ConceptMapType conceptMapType;
-
+
+	@ManyToOne
+	@JoinColumn(name = "creator", nullable = false)
 	private User creator;
-
+
+	@Column(name = "date_created", nullable = false, length = 19)
 	private Date dateCreated;
 
+	@ManyToOne
+	@JoinColumn(name = "changed_by")
 	private User changedBy;
-
+
+	@Column(name = "date_changed", length = 19)
 	private Date dateChanged;
-	
+
 	/** default constructor */
 	public DrugReferenceMap() {
 	}
-	
+
 	/**
 	 * @param term
 	 * @param conceptMapType
@@ -59,135 +94,135 @@ public DrugReferenceMap(ConceptReferenceTerm term, ConceptMapType conceptMapType
 		this.conceptReferenceTerm = term;
 		this.conceptMapType = conceptMapType;
 	}
-	
+
 	/**
 	 * @return Returns the drugReferenceMapId.
 	 */
 	public Integer getDrugReferenceMapId() {
 		return drugReferenceMapId;
 	}
-	
+
 	/**
 	 * @param drugReferenceMapId The drugReferenceMapId to set.
 	 */
 	public void setDrugReferenceMapId(Integer drugReferenceMapId) {
 		this.drugReferenceMapId = drugReferenceMapId;
 	}
-	
+
 	/**
 	 * @return Returns the drug.
 	 */
 	public Drug getDrug() {
 		return drug;
 	}
-	
+
 	/**
 	 * @param drug The drug to set.
 	 */
 	public void setDrug(Drug drug) {
 		this.drug = drug;
 	}
-	
+
 	/**
 	 * @return Returns the conceptReferenceTerm.
 	 */
 	public ConceptReferenceTerm getConceptReferenceTerm() {
 		return conceptReferenceTerm;
 	}
-	
+
 	/**
 	 * @param conceptReferenceTerm The conceptReferenceTerm to set.
 	 */
 	public void setConceptReferenceTerm(ConceptReferenceTerm conceptReferenceTerm) {
 		this.conceptReferenceTerm = conceptReferenceTerm;
 	}
-	
+
 	/**
 	 * @return Returns the conceptMapType.
 	 */
 	public ConceptMapType getConceptMapType() {
 		return conceptMapType;
 	}
-	
+
 	/**
 	 * @param conceptMapType The conceptMapType to set.
 	 */
 	public void setConceptMapType(ConceptMapType conceptMapType) {
 		this.conceptMapType = conceptMapType;
 	}
-	
+
 	/**
 	 * @return id - The unique Identifier for the object
 	 */
 	@Override
 	public Integer getId() {
 		return getDrugReferenceMapId();
 	}
-	
+
 	/**
 	 * @param id - The unique Identifier for the object
 	 */
 	@Override
 	public void setId(Integer id) {
 		setDrugReferenceMapId(id);
 	}
-	
+
 	/**
 	 * @return User - the user who created the object
 	 */
 	@Override
 	public User getCreator() {
 		return this.creator;
 	}
-	
+
 	/**
 	 * @param creator - the user who created the object
 	 */
 	@Override
 	public void setCreator(User creator) {
 		this.creator = creator;
 	}
-	
+
 	/**
 	 * @return Date - the date the object was created
 	 */
 	@Override
 	public Date getDateCreated() {
 		return dateCreated;
 	}
-	
+
 	/**
 	 * @param dateCreated - the date the object was created
 	 */
 	@Override
 	public void setDateCreated(Date dateCreated) {
 		this.dateCreated = dateCreated;
 	}
-	
+
 	/**
 	 * @return User - the user who last changed the object
 	 */
 	@Override
 	public User getChangedBy() {
 		return this.changedBy;
 	}
-	
+
 	/**
 	 * @param changedBy - the user who last changed the object
 	 */
 	@Override
 	public void setChangedBy(User changedBy) {
 		this.changedBy = changedBy;
 	}
-	
+
 	/**
 	 * @return Date - the date the object was last changed
 	 */
 	@Override
 	public Date getDateChanged() {
 		return this.dateChanged;
 	}
-	
+
 	/**
 	 * @param dateChanged - the date the object was last changed
 	 */

api/src/main/resources/hibernate.cfg.xml

@@ -43,7 +43,6 @@
 		<mapping resource="org/openmrs/api/db/hibernate/DiagnosisAttribute.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/DiagnosisAttributeType.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/Drug.hbm.xml" />
-		<mapping resource="org/openmrs/api/db/hibernate/DrugReferenceMap.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/Field.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/FieldType.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/Form.hbm.xml" />

api/src/test/java/org/openmrs/api/OrderServiceTest.java

@@ -32,6 +32,7 @@
 import org.openmrs.Condition;
 import org.openmrs.Diagnosis;
 import org.openmrs.Drug;
+import org.openmrs.DrugReferenceMap;
 import org.openmrs.DrugIngredient;
 import org.openmrs.DrugOrder;
 import org.openmrs.Encounter;
@@ -2735,6 +2736,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
 			.addAnnotatedClass(SerializedObject.class)
 			.addAnnotatedClass(PatientState.class)
 			.addAnnotatedClass(DrugIngredient.class)
+			.addAnnotatedClass(DrugReferenceMap.class)
 			.addAnnotatedClass(AlertRecipient.class)
 			.addAnnotatedClass(PatientIdentifierType.class)
 			.addAnnotatedClass(ProgramAttributeType.class)