#24060

Committed 16 Dec 2024 01:30PM UTC coverage: 22.573% (+0.004%) from 22.569%

Build # #24060

Build Type

push

github

Committed by

stevenwinship

Commit Message

Merge branch 'develop' into 10714-access-requests-missing-since-upgrade-v6-0

Run Details

2 of 18 new or added lines in 5 files covered. (11.11%)

3 existing lines in 1 file now uncovered.

19544 of 86582 relevant lines covered (22.57%)

0.23 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

7.69

/src/main/java/edu/harvard/iq/dataverse/DataverseFacetServiceBean.java

package edu.harvard.iq.dataverse;

import edu.harvard.iq.dataverse.util.LruCache;
import java.util.List;
import jakarta.ejb.EJB;
import jakarta.ejb.Stateless;
import jakarta.inject.Named;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceContext;

/**
 *
 * @author xyang
 * @author Michael Bar-Sinai
 */
@Stateless
@Named
public class DataverseFacetServiceBean implements java.io.Serializable {
    
    public static final LruCache<Long,List<DataverseFacet>> cache = new LruCache<>();
    
    @PersistenceContext(unitName = "VDCNet-ejbPU")
    private EntityManager em;
    
    @EJB
    DataverseServiceBean dataverses;
    
    public List<DataverseFacet> findByDataverseId(Long dataverseId) {
        List<DataverseFacet> res = cache.get(dataverseId);

        if ( res == null ) {
            res = em.createNamedQuery("DataverseFacet.findByDataverseId", DataverseFacet.class)
                            .setParameter("dataverseId", dataverseId).getResultList();
            cache.put(dataverseId, res);
        }

        return res; 
    }

    public void delete(DataverseFacet dataverseFacet) {
        em.remove(em.merge(dataverseFacet));
        cache.invalidate();
    }
    
    public void deleteFacetsFor(Dataverse d) {
        em.createNamedQuery("DataverseFacet.removeByOwnerId")
                .setParameter("ownerId", d.getId())
                .executeUpdate();
        cache.invalidate(d.getId());

    }

    public DataverseFacet create(int displayOrder, DatasetFieldType fieldType, Dataverse ownerDv) {
        DataverseFacet dataverseFacet = new DataverseFacet();

        dataverseFacet.setDisplayOrder(displayOrder);
        dataverseFacet.setDatasetFieldType(fieldType);
        dataverseFacet.setDataverse(ownerDv);
        ownerDv.getDataverseFacets().add(dataverseFacet);
        em.persist(dataverseFacet);

        cache.invalidate(ownerDv.getId());
        return dataverseFacet;
    }
    
    public DataverseFacet create(int displayOrder, Long datasetFieldTypeId, Long dataverseId) {
        return create(displayOrder, em.find(DatasetFieldType.class,datasetFieldTypeId),
                        dataverses.find(dataverseId) );
    }
    
}


1	package edu.harvard.iq.dataverse;
2
3	import edu.harvard.iq.dataverse.util.LruCache;
4	import java.util.List;
5	import jakarta.ejb.EJB;
6	import jakarta.ejb.Stateless;
7	import jakarta.inject.Named;
8	import jakarta.persistence.EntityManager;
9	import jakarta.persistence.PersistenceContext;
10
11	/**
12	*
13	* @author xyang
14	* @author Michael Bar-Sinai
15	*/
16	@Stateless
17	@Named
18	public class DataverseFacetServiceBean implements java.io.Serializable {	1✔
19
20	public static final LruCache<Long,List<DataverseFacet>> cache = new LruCache<>();	1✔
21
22	@PersistenceContext(unitName = "VDCNet-ejbPU")
23	private EntityManager em;
24
25	@EJB
26	DataverseServiceBean dataverses;
27
28	public List<DataverseFacet> findByDataverseId(Long dataverseId) {
29	List<DataverseFacet> res = cache.get(dataverseId);	×
30
31	if ( res == null ) {	×
32	res = em.createNamedQuery("DataverseFacet.findByDataverseId", DataverseFacet.class)	×
33	.setParameter("dataverseId", dataverseId).getResultList();	×
34	cache.put(dataverseId, res);	×
35	}
36
37	return res;	×
38	}
39
40	public void delete(DataverseFacet dataverseFacet) {
41	em.remove(em.merge(dataverseFacet));	×
42	cache.invalidate();	×
43	}	×
44
45	public void deleteFacetsFor(Dataverse d) {
NEW 46	em.createNamedQuery("DataverseFacet.removeByOwnerId")	×
NEW 47	.setParameter("ownerId", d.getId())	×
NEW 48	.executeUpdate();	×
UNCOV 49	cache.invalidate(d.getId());	×
50
NEW 51	}	×
52
53	public DataverseFacet create(int displayOrder, DatasetFieldType fieldType, Dataverse ownerDv) {
54	DataverseFacet dataverseFacet = new DataverseFacet();	×
55
56	dataverseFacet.setDisplayOrder(displayOrder);	×
57	dataverseFacet.setDatasetFieldType(fieldType);	×
58	dataverseFacet.setDataverse(ownerDv);	×
UNCOV 59	ownerDv.getDataverseFacets().add(dataverseFacet);	×
60	em.persist(dataverseFacet);	×
61
NEW 62	cache.invalidate(ownerDv.getId());	×
UNCOV 63	return dataverseFacet;	×
64	}
65
66	public DataverseFacet create(int displayOrder, Long datasetFieldTypeId, Long dataverseId) {
67	return create(displayOrder, em.find(DatasetFieldType.class,datasetFieldTypeId),	×
68	dataverses.find(dataverseId) );	×
69	}
70
71	}
72

IQSS / dataverse / #24060

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous