TRUNK-5804:Form Domain - Switching from Hibernate Mappings to Annotational

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

@@ -16,28 +16,53 @@
 import java.util.List;
 import java.util.Set;
 
+import jakarta.persistence.AttributeOverride;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+
 /**
  * Form
  *
  * @version 1.0
  */
 @Audited
+@Entity
+@Table(name = "form")
+@AttributeOverride(name = "retireReason", column = @Column(name = "retired_reason", length = 255))
+@AttributeOverride(name="description", column = @Column(name = "description", length = 1024))
 public class Form extends BaseChangeableOpenmrsMetadata {
 
 	public static final long serialVersionUID = 845634L;
 
 	// Fields
-
+	@Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "form_id")
 	private Integer formId;
-
+
+	@Column(name = "version", nullable = false, length = 50)
 	private String version;
 
+	@Column(name = "build", nullable = true)
 	private Integer build;
 
+	@Column(name = "published", length = 1)
 	private Boolean published = false;
-
+
+	@ManyToOne
+	@JoinColumn(name = "encounter_type")
 	private EncounterType encounterType;
-
+
+	@OneToMany(mappedBy = "form", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
 	private Set<FormField> formFields;
 
 	// Constructors
@@ -231,4 +256,4 @@ public void setId(Integer id) {
 		setFormId(id);
 
 	}
-}
+}

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

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

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

@@ -44,6 +44,7 @@
 import org.openmrs.DrugOrder;
 import org.openmrs.Encounter;
 import org.openmrs.EncounterRole;
+import org.openmrs.Form;
 import org.openmrs.FreeTextDosingInstructions;
 import org.openmrs.GlobalProperty;
 import org.openmrs.Location;
@@ -2787,6 +2788,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
 				.addAnnotatedClass(ConceptNameTag.class)
 			    .addAnnotatedClass(CareSetting.class) 
 				.addAnnotatedClass(LocationTag.class)
+				.addAnnotatedClass(Form.class)
 				.getMetadataBuilder().build();