Merge pull request #90 from alliance-genome/SCRUM-2820

Fixed timeout with objects
alliance-genome · Oct 4, 2023 · 18527e0 · 18527e0
2 parents 505fe84 + 4703f56
commit 18527e0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 20 deletions.
diff --git a/src/main/java/org/alliancegenome/agr_submission/BaseSQLDAO.java b/src/main/java/org/alliancegenome/agr_submission/BaseSQLDAO.java
@@ -5,6 +5,7 @@
 import java.util.List;
 import java.util.Map;
 
+import io.quarkus.logging.Log;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.TypedQuery;
@@ -13,9 +14,7 @@
 import jakarta.persistence.criteria.Path;
 import jakarta.persistence.criteria.Predicate;
 import jakarta.persistence.criteria.Root;
-import lombok.extern.jbosslog.JBossLog;
 
-@JBossLog
 public class BaseSQLDAO<E extends BaseEntity> extends BaseDAO<E> {
 
 	@PersistenceContext(name="primary")
@@ -26,20 +25,20 @@ protected BaseSQLDAO(Class<E> myClass) {
 	}
 
 	public E persist(E entity) {
-		log.debug("SqlDAO: persist: " + entity);
+		Log.debug("SqlDAO: persist: " + entity);
 		entityManager.persist(entity);
 		return entity;
 	}
 
 	public E find(Long id) {
-		log.debug("SqlDAO: find: " + id + " " + myClass);
+		Log.debug("SqlDAO: find: " + id + " " + myClass);
 		E entity = entityManager.find(myClass, id);
-		log.debug("Entity Found: " + entity);
+		Log.debug("Entity Found: " + entity);
 		return entity;
 	}
 
 	public List<E> findAll() {
-		log.debug("SqlDAO: findAll: " + myClass);
+		Log.debug("SqlDAO: findAll: " + myClass);
 		CriteriaBuilder cb = entityManager.getCriteriaBuilder();
 		CriteriaQuery<E> cq = cb.createQuery(myClass);
 		Root<E> rootEntry = cq.from(myClass);
@@ -49,24 +48,24 @@ public List<E> findAll() {
 	}
 
 	public E merge(E entity) {
-		log.debug("SqliteDAO: merge: " + entity);
+		Log.debug("SqliteDAO: merge: " + entity);
 		entityManager.merge(entity);
 		return entity;
 	}
 
 	public E remove(Long id) {
-		log.debug("SqliteDAO: remove: " + id);
+		Log.debug("SqliteDAO: remove: " + id);
 		E entity = find(id);
 		entityManager.remove(entity);
 		return entity;
 	}
 
 	public E findByField(String field, String value) {
-		log.debug("SqlDAO: findByField: " + field + " " + value);
+		Log.debug("SqlDAO: findByField: " + field + " " + value);
 		HashMap<String, Object> params = new HashMap<>();
 		params.put(field, value);
 		List<E> list = search(params);
-		log.debug("Result List: " + list);
+		Log.debug("Result List: " + list);
 		if(list.size() > 0) {
 			return list.get(0);
 		} else {
@@ -79,7 +78,7 @@ protected List<E> search(Map<String, Object> params) {
 	}
 
 	public List<E> search(Map<String, Object> params, String orderByField) {
-		log.debug("Search By Params: " + params + " Order by: " + orderByField);
+		Log.debug("Search By Params: " + params + " Order by: " + orderByField);
 		CriteriaBuilder builder = entityManager.getCriteriaBuilder();
 		CriteriaQuery<E> query = builder.createQuery(myClass);
 		Root<E> root = query.from(myClass);

diff --git a/src/main/java/org/alliancegenome/agr_submission/entities/ReleaseVersion.java b/src/main/java/org/alliancegenome/agr_submission/entities/ReleaseVersion.java
@@ -12,12 +12,11 @@
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -38,7 +37,7 @@ public class ReleaseVersion extends BaseEntity {
 	@OneToMany(mappedBy="releaseVersion")
 	private List<SnapShot> snapShots;
 
-	@OneToOne(fetch=FetchType.EAGER)
+	@ManyToOne
 	@JsonView({View.ReleaseVersionView.class})
 	private SchemaVersion defaultSchemaVersion;
 

diff --git a/src/main/java/org/alliancegenome/agr_submission/entities/SchemaVersion.java b/src/main/java/org/alliancegenome/agr_submission/entities/SchemaVersion.java
@@ -9,11 +9,9 @@
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -28,15 +26,15 @@ public class SchemaVersion extends BaseEntity {
 	@Column(unique = true)
 	private String schema;
 
-	@OneToMany(mappedBy="schemaVersion", fetch=FetchType.EAGER)
+	@OneToMany(mappedBy="schemaVersion")
 	@JsonView({View.SchemaVersionView.class})
 	private Set<SchemaFile> schemaFiles;
 
-	@OneToOne(mappedBy="defaultSchemaVersion")
+	@OneToMany(mappedBy="defaultSchemaVersion")
 	@JsonView({View.SchemaVersionView.class})
-	private ReleaseVersion releaseVersion;
+	private Set<ReleaseVersion> releaseVersions;
 
-	@OneToMany(mappedBy="schemaVersion", fetch=FetchType.EAGER)
+	@OneToMany(mappedBy="schemaVersion")
 	@JsonView({View.SchemaVersionView.class})
 	private Set<DataFile> dataFiles;