#8600 code cleanup named queries

IQSS · May 18, 2022 · 6af190e · 6af190e
1 parent cbfb1c0
commit 6af190e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 31 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/Template.java b/src/main/java/edu/harvard/iq/dataverse/Template.java
@@ -28,12 +28,22 @@
 import javax.validation.constraints.Size;
 
 import edu.harvard.iq.dataverse.util.DateUtil;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
 import org.hibernate.validator.constraints.NotBlank;
 
 /**
  *
  * @author skraffmiller
  */
+
+@NamedQueries({
+    @NamedQuery(name = "Template.findByOwnerId",
+               query = "select object(o) from Template as o where o.dataverse.id =:ownerId"),
+    @NamedQuery(name = "Template.findAll",
+               query = "select object(o) from Template as o")
+})
+
 @Entity
 @Table(indexes = {@Index(columnList="dataverse_id")})
 public class Template implements Serializable {

diff --git a/src/main/java/edu/harvard/iq/dataverse/TemplateServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/TemplateServiceBean.java
@@ -31,38 +31,17 @@ public Template find(Object pk) {
     }
 
     public Template save(Template template) {
-        /*
-                if (template.getId() == null) {
-            em.persist(template);
-            return template;
-        } else {
-            return em.merge(template);
-        } */
         return em.merge(template);
     }
-
-    public Template findByDeafultTemplateOwnerId(Long ownerId) {
-        TypedQuery<Template> query = em.createQuery("select object(o.defaultTemplate) from Dataverse as o where o.owner.id =:ownerId order by o.name", Template.class);
-        query.setParameter("ownerId", ownerId);
-        return query.getSingleResult();
-    }
 
-    public List<Template> findByOwnerId(Long ownerId) {
-        TypedQuery<Template> query = em.createQuery("select object(o) from Template as o where o.dataverse.id =:ownerId order by o.name", Template.class);
-        query.setParameter("ownerId", ownerId);
-        return query.getResultList();
+    public List<Template> findByOwnerId(Long ownerId) {              
+        return em.createNamedQuery("Template.findByOwnerId", Template.class).setParameter("ownerId", ownerId).getResultList();
     }
 
     public List<Template> findAll() {
-        TypedQuery<Template> query = em.createQuery("select object(o) from Template as o order by o.name", Template.class);
-        return query.getResultList();
+        return em.createNamedQuery("Template.findAll", Template.class).getResultList();
     }
 
-    public List<Template> findOrphan() {
-        TypedQuery<Template> query = em.createQuery("select object(o) from Template as o where o.dataverse.id is null order by o.name", Template.class);
-        return query.getResultList();
-    }
-
     public List<Dataverse> findDataversesByDefaultTemplateId(Long defaultTemplateId) {
         TypedQuery<Dataverse> query = em.createQuery("select object(o) from Dataverse as o where o.defaultTemplate.id =:defaultTemplateId order by o.name", Dataverse.class);
         query.setParameter("defaultTemplateId", defaultTemplateId);

diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Admin.java b/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
@@ -256,12 +256,16 @@ public Response findAllTemplates() {
     @GET
     public Response findTemplates(@PathParam("alias") String alias) {
         List<Template> templates;
-        try {
+
             if (alias.isEmpty()) {
                 templates = templateService.findAll();
             } else {
-                Dataverse owner = findDataverseOrDie(alias);
-                templates = templateService.findByOwnerId(owner.getId());
+                try{
+                    Dataverse owner = findDataverseOrDie(alias);
+                    templates = templateService.findByOwnerId(owner.getId());
+                } catch (WrappedResponse r){
+                    return r.getResponse();
+                }
             }
 
             JsonArrayBuilder container = Json.createArrayBuilder();
@@ -280,10 +284,7 @@ public Response findTemplates(@PathParam("alias") String alias) {
 
             return ok(container);
 
-        } catch (Exception e) {
-            logger.log(Level.SEVERE, "Error while testing permissions", e);
-            return error(Response.Status.INTERNAL_SERVER_ERROR, e.getMessage());
-        }
+
     }
 
 	@Path("authenticationProviderFactories")