TRUNK-5906 : ConceptReferenceTerm Domain - Switching from Hibernate Mappings to Annotations

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

@@ -11,11 +11,23 @@
 
 import java.util.LinkedHashSet;
 import java.util.Set;
-
+import javax.persistence.Entity;
 import org.hibernate.envers.Audited;
 import org.hibernate.search.annotations.Analyze;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
+import javax.persistence.Table;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Id;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import org.hibernate.annotations.GenericGenerator; 
+import org.hibernate.annotations.Parameter;
+import javax.persistence.OneToMany;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import java.util.HashSet;
 
 /**
  * A concept reference term is typically name for a concept by which it is referred in another
@@ -25,22 +37,37 @@
  * @since 1.9
  */
 @Audited
+@Entity
+@Table(name = "concept_reference_term")
 public class ConceptReferenceTerm extends BaseChangeableOpenmrsMetadata {
 
 	private static final long serialVersionUID = 1L;
 
 	@DocumentId
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "concept_reference_term_id_seq")
+	@GenericGenerator(
+			name = "concept_reference_term_id_seq",
+			strategy = "native",
+			parameters = @Parameter(name = "sequence", value = "concept_reference_term_concept_reference_term_id_seq")
+	)
+	@Column(name = "concept_reference_term_id")
 	private Integer conceptReferenceTermId;
 
+	@ManyToOne
+	@JoinColumn(name = "concept_source_id", nullable = false)
 	private ConceptSource conceptSource;
 
 	//The unique code used to identify the reference term in it's reference terminology
 	@Field(analyze = Analyze.NO)
+	@Column(name = "code", length = 255, nullable = false)
 	private String code;
 
+	@Column(name = "version", length = 50)
 	private String version;
 
-	private Set<ConceptReferenceTermMap> conceptReferenceTermMaps;
+	@OneToMany(mappedBy = "termA", cascade = CascadeType.ALL, orphanRemoval = true)
+	private Set<ConceptReferenceTermMap> conceptReferenceTermMaps = new HashSet<>();
 
 	/** default constructor */
 	public ConceptReferenceTerm() {

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

@@ -38,7 +38,6 @@
 		<mapping resource="org/openmrs/api/db/hibernate/ConceptMap.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/ConceptStopWord.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/ConceptSource.hbm.xml" />
-		<mapping resource="org/openmrs/api/db/hibernate/ConceptReferenceTerm.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/ConceptReferenceTermMap.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/DiagnosisAttribute.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/DiagnosisAttributeType.hbm.xml" />

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

@@ -2742,6 +2742,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
 			.addAnnotatedClass(ProgramAttributeType.class)
 			.addAnnotatedClass(HL7InError.class)
 			.addAnnotatedClass(OrderType.class)
+			.addAnnotatedClass(ConceptReferenceTerm.class)
 			.getMetadataBuilder().build();