update order set with annotations

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

@@ -12,15 +12,21 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Parameter;
 import org.hibernate.envers.Audited;
 import org.openmrs.api.APIException;
 
+import javax.persistence.*;
+
 /**
  * Represents the grouping of orders into a set,
  * so as to give decision support for the doctors
  * 
  * @since 1.12
  */
+@Entity
+@Table(name = "order_set")
 @Audited
 public class OrderSet extends BaseCustomizableMetadata<OrderSetAttribute> {
 
@@ -36,12 +42,30 @@ public enum Operator {
 		ALL, ONE, ANY
 	}
 
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "order_set_id_seq")
+	@GenericGenerator(
+		name = "order_set_id_seq",
+		strategy = "native",
+		parameters = @Parameter(name = "sequence", value = "order_set_order_set_id_seq")
+	)
+	@Column(name = "order_set_id", nullable = false)
 	private Integer orderSetId;
-
+
+	@Column(name = "operator", nullable = false)
+	@Enumerated(EnumType.STRING)
 	private Operator operator;
-
+
+	@OneToMany(
+		mappedBy = "orderSet",
+		cascade = CascadeType.ALL,
+		orphanRemoval = true
+	)
+	@OrderColumn(name = "sequence_number")
 	private List<OrderSetMember> orderSetMembers;
 
+	@ManyToOne
+	@JoinColumn(name = "category")
 	private Concept category;
 
 	/**

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

@@ -66,7 +66,6 @@
 		<mapping resource="org/openmrs/api/db/hibernate/Order.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/OrderAttribute.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/OrderAttributeType.hbm.xml" />
-		<mapping resource="org/openmrs/api/db/hibernate/OrderSet.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/OrderSetMember.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/OrderSetAttributeType.hbm.xml" />
 		<mapping resource="org/openmrs/api/db/hibernate/OrderSetAttribute.hbm.xml" />

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

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