TRUNK-5951: SerializedObject Domain - Switching from Hibernate Mappin…

…gs to Annotations (openmrs#4531)

api/src/main/java/org/openmrs/api/db/SerializedObject.java

@@ -9,22 +9,45 @@
  */
 package org.openmrs.api.db;
 
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Parameter;
 import org.openmrs.BaseChangeableOpenmrsMetadata;
 import org.openmrs.serialization.OpenmrsSerializer;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
 /**
  * Object representation of a Serialized Object as stored in the database.
  */
+@Entity
+@Table(name = "serialized_object")
 public class SerializedObject extends BaseChangeableOpenmrsMetadata {
-
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "serialized_object_id_seq")
+	@GenericGenerator(
+		name = "serialized_object_id_seq",
+		strategy = "native",
+		parameters = @Parameter(name = "sequence", value = "serialized_object_serialized_object_id_seq")
+	)
+	@Column(name = "serialized_object_id")
 	private Integer id;
-
+
+	@Column(name = "type", nullable = false, length = 255)
 	private String type;
-
+
+	@Column(name = "subtype", nullable = false, length = 255)
 	private String subtype;
-
+
+	@Column(name = "serialization_class", nullable = false, length = 255)
 	private Class<? extends OpenmrsSerializer> serializationClass;
-
+
+	@Column(name = "serialized_data", length = 16777215)
 	private String serializedData;
 
 	/**

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

@@ -90,7 +90,6 @@
 		<mapping resource="org/openmrs/api/db/hibernate/PatientState.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/Cohort.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/CohortMembership.hbm.xml"/>
-		<mapping resource="org/openmrs/api/db/hibernate/SerializedObject.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/OrderFrequency.hbm.xml" />
 
 		<!-- HL7 -->

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

@@ -63,6 +63,7 @@
 import org.openmrs.api.builder.DrugOrderBuilder;
 import org.openmrs.api.builder.OrderBuilder;
 import org.openmrs.api.context.Context;
+import org.openmrs.api.db.SerializedObject;
 import org.openmrs.api.db.hibernate.HibernateAdministrationDAO;
 import org.openmrs.api.db.hibernate.HibernateSessionFactoryBean;
 import org.openmrs.api.impl.OrderServiceImpl;
@@ -2660,6 +2661,7 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th
 			.addAnnotatedClass(PersonAttributeType.class)
 			.addAnnotatedClass(User.class)
 			.addAnnotatedClass(LocationAttributeType.class)
+			.addAnnotatedClass(SerializedObject.class)
 			.getMetadataBuilder().build();