TRUNK-5899: Replace Hibernate XML mapping with JPA annotations for ConceptAttributeType

 - add source code form to ConceptAttributeTypeTest.java
 - removed jakarta.persistence dependency in pom.xml based on code review

Author: Alex Devine

api/pom.xml

@@ -395,5 +395,4 @@
 			</build>
 		</profile>
 	</profiles>
-</project>
-
+</project>

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

@@ -9,30 +9,43 @@
  */
 package org.openmrs;
 
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Id;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Column;
+
+
 import org.hibernate.envers.Audited;
 import org.openmrs.attribute.AttributeType;
 import org.openmrs.attribute.BaseAttributeType;
 
 @Audited
+@Entity
+@Table(name = "concept_attribute_type")
 public class ConceptAttributeType extends BaseAttributeType<Concept> implements AttributeType<Concept> {
-	
-	private Integer conceptAttributeTypeId;
-	
-	public Integer getConceptAttributeTypeId() {
-		return conceptAttributeTypeId;
-	}
-	
-	public void setConceptAttributeTypeId(Integer conceptAttributeTypeId) {
-		this.conceptAttributeTypeId = conceptAttributeTypeId;
-	}
-	
-	@Override
-	public Integer getId() {
-		return getConceptAttributeTypeId();
-	}
-	
-	@Override
-	public void setId(Integer id) {
-		setConceptAttributeTypeId(id);
-	}
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "concept_attribute_type_id")
+    private Integer conceptAttributeTypeId;
+
+    public Integer getConceptAttributeTypeId() {
+        return conceptAttributeTypeId;
+    }
+
+    public void setConceptAttributeTypeId(Integer conceptAttributeTypeId) {
+        this.conceptAttributeTypeId = conceptAttributeTypeId;
+    }
+
+    @Override
+    public Integer getId() {
+        return getConceptAttributeTypeId();
+    }
+
+    @Override
+    public void setId(Integer id) {
+        setConceptAttributeTypeId(id);
+    }
 }

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

@@ -26,7 +26,6 @@
 		<mapping resource="org/openmrs/api/db/hibernate/Concept.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/ConceptAnswer.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/ConceptAttribute.hbm.xml" />
-		<mapping resource="org/openmrs/api/db/hibernate/ConceptAttributeType.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/ConceptNameTag.hbm.xml" />
@@ -110,6 +109,7 @@
 		<!-- These mappings are required because of rerefences in Obs & Concept -->
 		<mapping class="org.openmrs.ObsReferenceRange"/>
 		<mapping class="org.openmrs.ConceptReferenceRange"/>
+		<mapping class="org.openmrs.ConceptAttributeType"/>
   </session-factory>
 
-</hibernate-configuration>
+</hibernate-configuration>

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

@@ -0,0 +1,34 @@
+/**
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
+ * the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
+ *
+ * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
+ * graphic logo is a trademark of OpenMRS Inc.
+ */
+package org.openmrs;
+
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
+import org.openmrs.api.context.Context;
+import org.openmrs.test.jupiter.BaseContextSensitiveTest;
+
+public class ConceptAttributeTypeTest extends BaseContextSensitiveTest {
+
+    @Test
+    public void shouldSaveAndFetchConceptAttributeType() {
+        ConceptAttributeType type = new ConceptAttributeType();
+        type.setName("JPA Test Type");
+        type.setDatatypeClassname("org.openmrs.customdatatype.datatype.FreeTextDatatype");
+        type.setMinOccurs(0);
+        type.setMaxOccurs(1);
+
+        Context.getConceptService().saveConceptAttributeType(type);
+
+        ConceptAttributeType fetched = Context.getConceptService().getConceptAttributeType(type.getId());
+        assertNotNull(fetched);
+        assertEquals("JPA Test Type", fetched.getName());
+    }
+}