TRUNK-6280: Migrate GlobalProperty from Hibernate Mapping XML to JPA annotations

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

@@ -12,48 +12,83 @@
 import java.util.Date;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.envers.Audited;
 import org.openmrs.customdatatype.CustomDatatype;
 import org.openmrs.customdatatype.CustomDatatypeUtil;
 import org.openmrs.customdatatype.CustomValueDescriptor;
 import org.openmrs.customdatatype.SingleCustomValue;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
 /**
  * Global properties are simple key-value pairs persisted in the database GPs can be thought of as
  * something similar to environment variables used in operating systems.
  */
+@Entity
+@Table(name = "global_property")
+@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 @Audited
 public class GlobalProperty extends BaseOpenmrsObject implements CustomValueDescriptor, SingleCustomValue<GlobalProperty> {
 
 	private static final long serialVersionUID = 1L;
 
+	@Id
+	@Column(name = "property", nullable = false, length = 255)
 	private String property = "";
 
+	@Column(name = "property_value", columnDefinition = "TEXT")
+	@Lob
 	private String propertyValue = "";
 
 	private transient Object typedValue;
 
 	// if true, indicates that setValue has been called, and we need to invoke CustomDatatype's save
+	@Transient
 	private boolean dirty = false;
 
+	@Column(name = "description", length = 1024)
 	private String description = "";
 
+	@Column(name = "datatype", length = 255)
 	private String datatypeClassname;
 
+	@Column(name = "datatype_config", columnDefinition = "TEXT")
+	@Lob
 	private String datatypeConfig;
 
+	@Column(name = "preferred_handler", length = 255)
 	private String preferredHandlerClassname;
 
+	@Column(name = "handler_config", columnDefinition = "TEXT")
+	@Lob
 	private String handlerConfig;
 
+	@ManyToOne
+	@JoinColumn(name = "changed_by")
 	private User changedBy;
 
+	@Column(name = "date_changed")
 	private Date dateChanged;
 
+	@ManyToOne
+	@JoinColumn(name = "view_privilege")
 	private Privilege viewPrivilege;
 
+	@ManyToOne
+	@JoinColumn(name = "edit_privilege")
 	private Privilege editPrivilege;
 
+	@ManyToOne
+	@JoinColumn(name = "delete_privilege")
 	private Privilege deletePrivilege;
 
 

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

@@ -49,7 +49,6 @@
 		<mapping resource="org/openmrs/api/db/hibernate/Form.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/FormField.hbm.xml" />
         <mapping resource="org/openmrs/api/db/hibernate/FormResource.hbm.xml" />
-		<mapping resource="org/openmrs/api/db/hibernate/GlobalProperty.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/Obs.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/Person.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/PersonAttribute.hbm.xml" />

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

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