Work around to solve CSM-112

openmrs · Jul 27, 2015 · c27e059 · c27e059
1 parent 30b0d4e
commit c27e059
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 28 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -39,6 +39,14 @@
 			<scope>provided</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.openmrs.api</groupId>
+			<artifactId>openmrs-api</artifactId>
+			<version>${openMRSVersion}</version>
+			<type>test-jar</type>
+			<scope>test</scope>
+		</dependency>
+
 	</dependencies>
 
 	<build>

diff --git a/...rc/main/java/org/openmrs/module/chartsearch/api/db/hibernate/HibernateChartSearchDAO.java b/...rc/main/java/org/openmrs/module/chartsearch/api/db/hibernate/HibernateChartSearchDAO.java
@@ -32,7 +32,6 @@
 import org.openmrs.module.chartsearch.cache.ChartSearchNote;
 import org.openmrs.module.chartsearch.solr.ChartSearchCustomIndexer;
 
-
 /**
  * It is a default implementation of {@link ChartSearchDAO}.
  */
@@ -180,7 +179,7 @@ public void deleteSearchHistory(ChartSearchHistory searchHistory) {
 	@Override
 	public ChartSearchHistory getSearchHistoryByUuid(String uuid) {
 		ChartSearchHistory history = (ChartSearchHistory) sessionFactory.getCurrentSession()
-		        .createQuery("from ChartSearchHistory h where h.uuid = :uuid").setString("uuid", uuid).uniqueResult();
+		        .createQuery("from ChartSearchHistory h where h.uuid = :uuid").setParameter("uuid", uuid).uniqueResult();
 
 		return history;
 	}
@@ -238,7 +237,7 @@ public ChartSearchNote getSearchNote(Integer noteId) {
 	@Override
 	public ChartSearchNote getSearchNoteByUuid(String uuid) {
 		ChartSearchNote note = (ChartSearchNote) sessionFactory.getCurrentSession()
-		        .createQuery("from ChartSearchNote n where n.uuid = :uuid").setString("uuid", uuid).uniqueResult();
+		        .createQuery("from ChartSearchNote n where n.uuid = :uuid").setParameter("uuid", uuid).uniqueResult();
 
 		return note;
 	}

diff --git a/api/src/main/java/org/openmrs/module/chartsearch/cache/ChartSearchBookmark.java b/api/src/main/java/org/openmrs/module/chartsearch/cache/ChartSearchBookmark.java
@@ -12,6 +12,7 @@
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
+import java.util.UUID;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -23,13 +24,12 @@
 import javax.persistence.Table;
 
 import org.apache.commons.lang3.StringUtils;
-import org.openmrs.BaseOpenmrsObject;
 import org.openmrs.Patient;
 import org.openmrs.User;
 
 @Entity
 @Table(name = "chartsearch_bookmark")
-public class ChartSearchBookmark extends BaseOpenmrsObject implements Serializable {
+public class ChartSearchBookmark implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
@@ -38,6 +38,9 @@ public class ChartSearchBookmark extends BaseOpenmrsObject implements Serializab
 	@Column(name = "bookmark_id")
 	private Integer bookmarkId;
 
+	@Column(name = "uuid", unique = true, nullable = false, length = 38)
+	private String uuid = UUID.randomUUID().toString();
+
 	@Column(name = "bookmark_name", nullable = false)
 	private String bookmarkName;
 
@@ -62,14 +65,12 @@ public class ChartSearchBookmark extends BaseOpenmrsObject implements Serializab
 	@Column(name = "selected_categories")
 	private String selectedCategories;
 
-	@Override
-	public Integer getId() {
-		return getBookmarkId();
+	public String getUuid() {
+		return uuid;
 	}
 
-	@Override
-	public void setId(Integer id) {
-		setBookmarkId(id);
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
 	}
 
 	public Integer getBookmarkId() {

diff --git a/api/src/main/java/org/openmrs/module/chartsearch/cache/ChartSearchHistory.java b/api/src/main/java/org/openmrs/module/chartsearch/cache/ChartSearchHistory.java
@@ -11,6 +11,7 @@
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.UUID;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -21,20 +22,23 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
-import org.openmrs.BaseOpenmrsObject;
 import org.openmrs.Patient;
 import org.openmrs.User;
 
 @Entity
 @Table(name = "chartsearch_history")
-@SuppressWarnings("serial")
-public class ChartSearchHistory extends BaseOpenmrsObject implements Serializable {
+public class ChartSearchHistory implements Serializable {
+
+	private static final long serialVersionUID = 1L;
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "search_id")
 	private Integer searchId;
 
+	@Column(name = "uuid", unique = true, nullable = false, length = 38)
+	private String uuid = UUID.randomUUID().toString();
+
 	/**
 	 * Phrase or text searched for
 	 */
@@ -52,14 +56,12 @@ public class ChartSearchHistory extends BaseOpenmrsObject implements Serializabl
 	@JoinColumn(name = "user_id", nullable = false)
 	private User historyOwner;
 
-	@Override
-	public Integer getId() {
-		return getSearchId();
+	public String getUuid() {
+		return uuid;
 	}
 
-	@Override
-	public void setId(Integer id) {
-		setSearchId(id);
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
 	}
 
 	public Integer getSearchId() {

diff --git a/api/src/main/java/org/openmrs/module/chartsearch/cache/ChartSearchNote.java b/api/src/main/java/org/openmrs/module/chartsearch/cache/ChartSearchNote.java
@@ -11,6 +11,7 @@
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.UUID;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -21,7 +22,6 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
-import org.openmrs.BaseOpenmrsObject;
 import org.openmrs.Patient;
 import org.openmrs.User;
 
@@ -30,7 +30,7 @@
  */
 @Entity
 @Table(name = "chartsearch_note")
-public class ChartSearchNote extends BaseOpenmrsObject implements Serializable {
+public class ChartSearchNote implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
@@ -39,6 +39,9 @@ public class ChartSearchNote extends BaseOpenmrsObject implements Serializable {
 	@Column(name = "note_id")
 	private Integer noteId;
 
+	@Column(name = "uuid", unique = true, nullable = false, length = 38)
+	private String uuid = UUID.randomUUID().toString();
+
 	@Column(name = "comment", nullable = false)
 	private String comment;
 
@@ -62,14 +65,12 @@ public class ChartSearchNote extends BaseOpenmrsObject implements Serializable {
 	@Column(name = "display_color", length = 10)
 	private String displayColor;
 
-	@Override
-	public Integer getId() {
-		return getNoteId();
+	public String getUuid() {
+		return uuid;
 	}
 
-	@Override
-	public void setId(Integer id) {
-		setNoteId(id);
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
 	}
 
 	public Integer getNoteId() {