TRUNK-5911: Migrate ConceptStopWord to JPA annotations

Author: pidsonn

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

@@ -14,6 +14,13 @@
 import org.hibernate.envers.Audited;
 import org.openmrs.api.context.Context;
 import org.springframework.util.StringUtils;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import jakarta.persistence.Id;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Column;
+
 
 /**
  * ConceptStopWord is the real world term used to filter the words for indexing
@@ -23,15 +30,22 @@
  * @since 1.8
  */
 @Audited
+@Entity
+@Table(name = "concept_stop_word")
 public class ConceptStopWord extends BaseOpenmrsObject {
 
 	private static final long serialVersionUID = 3671020002642184656L;
 
 	// Fields
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "concept_stop_word_id")
 	private Integer conceptStopWordId;
-	
+
+	@Column(name = "word", nullable = false)
 	private String value;
-	
+
+	@Column(name = "locale", nullable = false)
 	private Locale locale;
 
 	// Constructors

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

@@ -26,7 +26,6 @@
 		<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" />
-		<mapping resource="org/openmrs/api/db/hibernate/ConceptStopWord.hbm.xml" />
 		<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/FieldType.hbm.xml" />
@@ -78,6 +77,9 @@
 		<!-- These mappings are required because of references in Obs & Concept -->
 		<mapping class="org.openmrs.ObsReferenceRange"/>
 		<mapping class="org.openmrs.ConceptReferenceRange"/>
-  </session-factory>
+		
+		<!-- Mapping for ConceptStopWord domain switched to annotations -->
+		<mapping class="org.openmrs.ConceptStopWord"/>
+	</session-factory>
 
 </hibernate-configuration>

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

@@ -36,6 +36,7 @@
 import org.openmrs.ConceptSource;
 import org.openmrs.ConceptStateConversion;
 import org.openmrs.ConceptReferenceTermMap;
+import org.openmrs.ConceptStopWord;
 import org.openmrs.Condition;
 import org.openmrs.Diagnosis;
 import org.openmrs.Drug;
@@ -2863,6 +2864,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
 				.addAnnotatedClass(ConceptAnswer.class)
 				.addAnnotatedClass(ConceptClass.class)
 			    .addAnnotatedClass(ConceptMap.class)
+			    .addAnnotatedClass(ConceptStopWord.class)
 				.addAnnotatedClass(FormResource.class)
 				.addAnnotatedClass(VisitType.class)
 				.addAnnotatedClass(ProviderRole.class)