TRUNK-5801: EncounterType Domain - Switching from Hibernate Mappings to Annotations

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

@@ -9,22 +9,50 @@
  */
 package org.openmrs;
 
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Parameter;
 import org.hibernate.envers.Audited;
 
+import javax.persistence.AttributeOverride;
+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;
+
 /**
  * An EncounterType defines how a certain kind of {@link Encounter}.
  * 
  * @see Encounter
  */
+@Entity
+@Table(name = "encounter_type")
+@AttributeOverride(name = "name", column = @Column(name = "name", length = 50, nullable = false, unique = true))
+@AttributeOverride(name = "description", column = @Column(name = "description", length = 1024))
 @Audited
 public class EncounterType extends BaseChangeableOpenmrsMetadata {
 
 	public static final long serialVersionUID = 789L;
-
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "encounter_type_id_seq")
+	@GenericGenerator(
+		name = "encounter_type_id_seq",
+		strategy = "native",
+		parameters = @Parameter(name = "sequence", value = "encounter_type_encounter_type_id_seq")
+	)
+	@Column(name = "encounter_type_id")
 	private Integer encounterTypeId;
-
+
+	@ManyToOne
+	@JoinColumn(name = "view_privilege")
 	private Privilege viewPrivilege;
-
+
+	@ManyToOne
+	@JoinColumn(name = "edit_privilege")
 	private Privilege editPrivilege;
 
 	// Constructors

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

@@ -76,7 +76,6 @@
 		<mapping resource="org/openmrs/api/db/hibernate/CareSetting.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/LocationTag.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/LocationAttribute.hbm.xml" />
-		<mapping resource="org/openmrs/api/db/hibernate/EncounterType.hbm.xml" />
         <mapping resource="org/openmrs/api/db/hibernate/EncounterProvider.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/EncounterRole.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/Program.hbm.xml" />

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

@@ -35,6 +35,7 @@
 import org.openmrs.DrugIngredient;
 import org.openmrs.DrugOrder;
 import org.openmrs.Encounter;
+import org.openmrs.EncounterType;
 import org.openmrs.FreeTextDosingInstructions;
 import org.openmrs.GlobalProperty;
 import org.openmrs.Location;
@@ -2740,6 +2741,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
 			.addAnnotatedClass(ProgramAttributeType.class)
 			.addAnnotatedClass(HL7InError.class)
 			.addAnnotatedClass(OrderType.class)
+			.addAnnotatedClass(EncounterType.class)
 			.getMetadataBuilder().build();