Refactor SampleType: Move PID column to unique constraints and add getter/setter methods

Author: HZBPhilippA

src/main/java/org/icatproject/core/entity/SampleType.java

@@ -26,16 +26,20 @@
 @SuppressWarnings("serial")
 @Entity
 @Table(uniqueConstraints = { @UniqueConstraint(columnNames = { "FACILITY_ID", "NAME",
-		"MOLECULARFORMULA" }) })
+		"PID" }) })
 public class SampleType extends EntityBaseBean implements Serializable {
 
 	@Comment("The facility which has defined this sample type")
 	@JoinColumn(name = "FACILITY_ID", nullable = false)
 	@ManyToOne(fetch = FetchType.LAZY)
 	private Facility facility;
 
+	@Comment("A persistent identifier attributed to this sample type, ideally referring to a vocabulary term")
+    @Column(name = "PID", nullable = false)
+    private String pid;
+
 	@Comment("The formula written as a string -e.g. C2H6O2 for ethylene glycol")
-	@Column(nullable = false, name = "MOLECULARFORMULA")
+	@Column(name = "MOLECULARFORMULA")
 	private String molecularFormula;
 
 	@Column(nullable = false, name = "NAME")
@@ -58,6 +62,10 @@ public Facility getFacility() {
 		return facility;
 	}
 
+	public String getPid() {
+        return pid;
+    }
+
 	public String getMolecularFormula() {
 		return molecularFormula;
 	}
@@ -78,6 +86,10 @@ public void setFacility(Facility facility) {
 		this.facility = facility;
 	}
 
+	public void setPid(String pid) {
+        this.pid = pid;
+    }
+
 	public void setMolecularFormula(String molecularFormula) {
 		this.molecularFormula = molecularFormula;
 	}