TRUNK-5833: Switch ConceptDescription domain from Hibernate mapping t… (#5456)

* TRUNK-5833: Switch ConceptDescription domain from Hibernate mapping to annotations

* TRUNK-5833: Set concept_description_id as non-nullable

---------

Co-authored-by: dkayiwa <[email protected]>

Author: pidsonn

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

@@ -9,6 +9,14 @@
  */
 package org.openmrs;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 import org.hibernate.envers.Audited;
 
 import java.util.Date;
@@ -18,25 +26,40 @@
  * ConceptDescription is the localized description of a concept.
  */
 @Audited
+@Entity
+@Table(name = "concept_description")
 public class ConceptDescription extends BaseOpenmrsObject implements Auditable, java.io.Serializable {
 
 	private static final long serialVersionUID = -7223075113369136584L;
 
 	// Fields
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "concept_description_id", nullable = false)
 	private Integer conceptDescriptionId;
-	
+
+	@ManyToOne(optional = false)
+	@JoinColumn(name = "concept_id", nullable = false)
 	private Concept concept;
-	
+
+	@Column(name = "description", nullable = false, length = 65535, columnDefinition = "text")
 	private String description;
-	
+
+	@Column(name = "locale", nullable = false, length = 50)
 	private Locale locale;
-	
+
+	@ManyToOne(optional = false)
+	@JoinColumn(name = "creator", nullable = false)
 	private User creator;
-	
+
+	@Column(name = "date_created", nullable = false)
 	private Date dateCreated;
-	
+
+	@ManyToOne
+	@JoinColumn(name = "changed_by")
 	private User changedBy;
-	
+
+	@Column(name = "date_changed")
 	private Date dateChanged;
 
 	// Constructors

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

@@ -22,7 +22,6 @@
 		<!-- API -->
 		<mapping resource="org/openmrs/api/db/hibernate/Concept.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/ConceptAttribute.hbm.xml" />
-		<mapping resource="org/openmrs/api/db/hibernate/ConceptDescription.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/ConceptName.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/ConceptProposal.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/ConceptSet.hbm.xml" />

api/src/main/resources/org/openmrs/api/db/hibernate/ConceptDescription.hbm.xml

@@ -2911,7 +2911,8 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
 			    .addAnnotatedClass(ConceptReferenceTermMap.class)
 			    .addAnnotatedClass(ConceptReferenceTerm.class)
 				.addAnnotatedClass(ConceptAnswer.class)
-				.addAnnotatedClass(ConceptClass.class)
+			    .addAnnotatedClass(ConceptDescription.class)
+			    .addAnnotatedClass(ConceptClass.class)
 			    .addAnnotatedClass(ConceptMap.class)
 				.addAnnotatedClass(FormResource.class)
 				.addAnnotatedClass(VisitType.class)