TRUNK-5797: Field Domain - Switching from Hibernate Mappings to Annotations

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

@@ -13,34 +13,66 @@
 import java.util.Set;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Parameter;
 import org.hibernate.envers.Audited;
 
+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.Lob;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
 /**
  * Field
  *
  * @version 1.0
  */
+@Entity
+@Table(name = "field")
 @Audited
 public class Field extends BaseChangeableOpenmrsMetadata {
 
 	public static final long serialVersionUID = 4454L;
 
 	// Fields
-
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "field_id_seq")
+	@GenericGenerator(
+		name = "field_id_seq",
+		strategy = "native",
+		parameters = @Parameter(name = "sequence", value = "field_field_id_seq")
+	)
+	@Column(name = "field_id")
 	private Integer fieldId;
-
+
+	@ManyToOne
+	@JoinColumn(name = "field_type")
 	private FieldType fieldType;
-
+
+	@ManyToOne
+	@JoinColumn(name = "concept_id")
 	private Concept concept;
-
+
+	@Column(name = "table_name", length = 50)
 	private String tableName;
 
+	@Column(name = "attribute_name", length = 50)
 	private String attributeName;
-
+
+	@Column(name = "default_value", columnDefinition = "TEXT")
+	@Lob
 	private String defaultValue;
-
+
+	@Column(name = "select_multiple", length = 1, nullable = false)
 	private Boolean selectMultiple = false;
 
+	@Transient
 	private Set<FieldAnswer> answers;
 
 	// Constructors

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

@@ -44,7 +44,6 @@
 		<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" />
 		<mapping resource="org/openmrs/api/db/hibernate/FormField.hbm.xml" />

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

@@ -2740,6 +2740,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
 			.addAnnotatedClass(ProgramAttributeType.class)
 			.addAnnotatedClass(HL7InError.class)
 			.addAnnotatedClass(OrderType.class)
+			.addAnnotatedClass(org.openmrs.Field.class)
 			.getMetadataBuilder().build();