Reverted the lazy loading and transactional with read-only with propagation

Camelia-Orcid · Camelia-Orcid · commit 1743379497a0 · 2026-06-17T19:44:10.000+01:00
diff --git a/orcid-core/src/main/java/org/orcid/core/manager/read_only/impl/ClientManagerReadOnlyImpl.java b/orcid-core/src/main/java/org/orcid/core/manager/read_only/impl/ClientManagerReadOnlyImpl.java
@@ -12,10 +12,7 @@
 import org.orcid.jaxb.model.client_v2.ClientSummary;
 import org.orcid.persistence.dao.ClientDetailsDao;
 import org.orcid.persistence.jpa.entities.ClientDetailsEntity;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 
-@Transactional(readOnly = true, propagation = Propagation.REQUIRED)
 public class ClientManagerReadOnlyImpl implements ClientManagerReadOnly {
 
     @Resource
diff --git a/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/AddressManagerReadOnlyImpl.java b/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/AddressManagerReadOnlyImpl.java
@@ -11,10 +11,7 @@
 import org.orcid.persistence.dao.AddressDao;
 import org.orcid.persistence.jpa.entities.AddressEntity;
 import org.springframework.cache.annotation.Cacheable;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 
-@Transactional(readOnly = true, propagation = Propagation.REQUIRED)
 public class AddressManagerReadOnlyImpl extends ManagerReadOnlyBaseImpl implements AddressManagerReadOnly {
     
     @Resource
diff --git a/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/AffiliationsManagerReadOnlyImpl.java b/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/AffiliationsManagerReadOnlyImpl.java
@@ -43,12 +43,9 @@
 import org.orcid.jaxb.model.v3.release.record.summary.QualificationSummary;
 import org.orcid.jaxb.model.v3.release.record.summary.ServiceSummary;
 import org.orcid.persistence.dao.OrgAffiliationRelationDao;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 import org.orcid.persistence.jpa.entities.OrgAffiliationRelationEntity;
 import org.orcid.pojo.ajaxForm.PojoUtil;
 
-@Transactional(readOnly = true, propagation = Propagation.REQUIRED)
 public class AffiliationsManagerReadOnlyImpl extends ManagerReadOnlyBaseImpl implements AffiliationsManagerReadOnly {
     
     @Resource(name = "jpaJaxbDistinctionAdapterV3")
diff --git a/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/ClientDetailsManagerReadOnlyImpl.java b/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/ClientDetailsManagerReadOnlyImpl.java
@@ -19,10 +19,7 @@
 import org.orcid.pojo.ajaxForm.PojoUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 
-@Transactional(readOnly = true, propagation = Propagation.REQUIRED)
 public class ClientDetailsManagerReadOnlyImpl implements ClientDetailsManagerReadOnly {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ClientDetailsManagerReadOnlyImpl.class);
diff --git a/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/ClientManagerReadOnlyImpl.java b/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/ClientManagerReadOnlyImpl.java
@@ -12,10 +12,7 @@
 import org.orcid.jaxb.model.v3.release.client.ClientSummary;
 import org.orcid.persistence.dao.ClientDetailsDao;
 import org.orcid.persistence.jpa.entities.ClientDetailsEntity;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 
-@Transactional(readOnly = true, propagation = Propagation.REQUIRED)
 public class ClientManagerReadOnlyImpl implements ClientManagerReadOnly {
 
     @Resource(name = "jpaJaxbClientAdapterV3")
diff --git a/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/EmailManagerReadOnlyImpl.java b/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/EmailManagerReadOnlyImpl.java
@@ -28,15 +28,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cache.annotation.Cacheable;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 
  * @author Will Simpson
  * 
  */
-@Transactional(readOnly = true, propagation = Propagation.REQUIRED)
 public class EmailManagerReadOnlyImpl extends ManagerReadOnlyBaseImpl implements EmailManagerReadOnly {
     private static final Logger LOGGER = LoggerFactory.getLogger(EmailManagerReadOnlyImpl.class);
     
diff --git a/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/ExternalIdentifierManagerReadOnlyImpl.java b/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/ExternalIdentifierManagerReadOnlyImpl.java
@@ -10,10 +10,7 @@
 import org.orcid.jaxb.model.v3.release.record.PersonExternalIdentifiers;
 import org.orcid.persistence.dao.ExternalIdentifierDao;
 import org.orcid.persistence.jpa.entities.ExternalIdentifierEntity;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 
-@Transactional(readOnly = true, propagation = Propagation.REQUIRED)
 public class ExternalIdentifierManagerReadOnlyImpl extends ManagerReadOnlyBaseImpl implements ExternalIdentifierManagerReadOnly {
     
     @Resource(name = "jpaJaxbExternalIdentifierAdapterV3")
diff --git a/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/GroupIdRecordManagerReadOnlyImpl.java b/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/GroupIdRecordManagerReadOnlyImpl.java
@@ -14,10 +14,7 @@
 import org.orcid.jaxb.model.v3.release.groupid.GroupIdRecords;
 import org.orcid.persistence.dao.GroupIdRecordDao;
 import org.orcid.persistence.jpa.entities.GroupIdRecordEntity;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 
-@Transactional(readOnly = true, propagation = Propagation.REQUIRED)
 public class GroupIdRecordManagerReadOnlyImpl implements GroupIdRecordManagerReadOnly {
 
     @Resource(name = "jpaJaxbGroupIdRecordAdapterV3")
diff --git a/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/OtherNameManagerReadOnlyImpl.java b/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/OtherNameManagerReadOnlyImpl.java
@@ -10,10 +10,7 @@
 import org.orcid.jaxb.model.v3.release.record.OtherNames;
 import org.orcid.persistence.dao.OtherNameDao;
 import org.orcid.persistence.jpa.entities.OtherNameEntity;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 
-@Transactional(readOnly = true, propagation = Propagation.REQUIRED)
 public class OtherNameManagerReadOnlyImpl extends ManagerReadOnlyBaseImpl implements OtherNameManagerReadOnly {
        
     @Resource(name = "jpaJaxbOtherNameAdapterV3")
diff --git a/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/PeerReviewManagerReadOnlyImpl.java b/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/PeerReviewManagerReadOnlyImpl.java
@@ -31,10 +31,7 @@
 import org.orcid.pojo.PeerReviewMinimizedSummary;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 
-@Transactional(readOnly = true, propagation = Propagation.REQUIRED)
 public class PeerReviewManagerReadOnlyImpl extends ManagerReadOnlyBaseImpl implements PeerReviewManagerReadOnly {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(PeerReviewManagerReadOnlyImpl.class);
diff --git a/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/ProfileFundingManagerReadOnlyImpl.java b/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/ProfileFundingManagerReadOnlyImpl.java
@@ -21,10 +21,7 @@
 import org.orcid.persistence.dao.ProfileFundingDao;
 import org.orcid.persistence.jpa.entities.ProfileFundingEntity;
 import org.orcid.pojo.ajaxForm.PojoUtil;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 
-@Transactional(readOnly = true, propagation = Propagation.REQUIRED)
 public class ProfileFundingManagerReadOnlyImpl extends ManagerReadOnlyBaseImpl implements ProfileFundingManagerReadOnly {
     
     @Resource(name = "jpaJaxbFundingAdapterV3")
diff --git a/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/ProfileKeywordManagerReadOnlyImpl.java b/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/ProfileKeywordManagerReadOnlyImpl.java
@@ -10,10 +10,7 @@
 import org.orcid.jaxb.model.v3.release.record.Keywords;
 import org.orcid.persistence.dao.ProfileKeywordDao;
 import org.orcid.persistence.jpa.entities.ProfileKeywordEntity;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 
-@Transactional(readOnly = true, propagation = Propagation.REQUIRED)
 public class ProfileKeywordManagerReadOnlyImpl extends ManagerReadOnlyBaseImpl implements ProfileKeywordManagerReadOnly {
 
     @Resource(name = "jpaJaxbKeywordAdapterV3")
diff --git a/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/RecordNameManagerReadOnlyImpl.java b/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/RecordNameManagerReadOnlyImpl.java
@@ -13,15 +13,12 @@
 import org.orcid.pojo.ajaxForm.PojoUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 
  * @author Angel Montenegro
  * 
  */
-@Transactional(readOnly = true, propagation = Propagation.REQUIRED)
 public class RecordNameManagerReadOnlyImpl extends ManagerReadOnlyBaseImpl implements RecordNameManagerReadOnly {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(RecordNameManagerReadOnlyImpl.class);
diff --git a/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/ResearchResourceManagerReadOnlyImpl.java b/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/ResearchResourceManagerReadOnlyImpl.java
@@ -38,7 +38,6 @@ public ResearchResource getResearchResource(String orcid, Long researchResourceI
     }
 
     @Override
-    @Transactional
     public ResearchResourceSummary getResearchResourceSummary(String orcid, Long researchResourceId) {
         ResearchResourceEntity e = rrDao.getResearchResource(orcid, researchResourceId);
         return jpaJaxbResearchResourceAdapter.toSummary(e);
@@ -52,7 +51,6 @@ public List<ResearchResource> findResearchResources(String orcid) {
     }
 
     @Override
-    @Transactional
     public List<ResearchResourceSummary> getResearchResourceSummaryList(String orcid) {
         List<ResearchResourceEntity> e = rrDao.getByUser(orcid, getLastModified(orcid));
         return jpaJaxbResearchResourceAdapter.toSummaries(e);
diff --git a/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/ResearcherUrlManagerReadOnlyImpl.java b/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/ResearcherUrlManagerReadOnlyImpl.java
@@ -10,10 +10,7 @@
 import org.orcid.jaxb.model.v3.release.record.ResearcherUrls;
 import org.orcid.persistence.dao.ResearcherUrlDao;
 import org.orcid.persistence.jpa.entities.ResearcherUrlEntity;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 
-@Transactional(readOnly = true, propagation = Propagation.REQUIRED)
 public class ResearcherUrlManagerReadOnlyImpl extends ManagerReadOnlyBaseImpl implements ResearcherUrlManagerReadOnly {
 
     @Resource(name = "jpaJaxbResearcherUrlAdapterV3")
diff --git a/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/SpamManagerReadOnlyImpl.java b/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/SpamManagerReadOnlyImpl.java
@@ -9,10 +9,7 @@
 import org.orcid.persistence.dao.SpamDao;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 
-@Transactional(readOnly = true, propagation = Propagation.REQUIRED)
 public class SpamManagerReadOnlyImpl implements SpamManagerReadOnly {
     
     private static final Logger LOGGER = LoggerFactory.getLogger(SpamManagerReadOnlyImpl.class);
diff --git a/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/WorkManagerReadOnlyImpl.java b/orcid-core/src/main/java/org/orcid/core/manager/v3/read_only/impl/WorkManagerReadOnlyImpl.java
@@ -53,12 +53,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 
 import static org.orcid.pojo.ajaxForm.PojoUtil.getWorkForm;
 
-@Transactional(readOnly = true, propagation = Propagation.REQUIRED)
 public class WorkManagerReadOnlyImpl extends ManagerReadOnlyBaseImpl implements WorkManagerReadOnly {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(WorkManagerReadOnlyImpl.class);
diff --git a/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/GenericDaoImpl.java b/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/GenericDaoImpl.java
@@ -34,14 +34,12 @@ public GenericDaoImpl(Class<E> clazz) {
     }
 
     @Override
-    @Transactional(readOnly = true, propagation = Propagation.REQUIRED)
     public E find(I id) {
         return entityManager.find(clazz, id);
     }
 
     @SuppressWarnings("unchecked")
     @Override
-    @Transactional(readOnly = true, propagation = Propagation.REQUIRED)
     public List<E> findLastModifiedBefore(Date latestDate, int maxResults) {
         Query query = entityManager.createQuery("from " + clazz.getSimpleName() + " where lastModified <= :latestDate");
         query.setParameter("latestDate", latestDate);
@@ -51,7 +49,6 @@ public List<E> findLastModifiedBefore(Date latestDate, int maxResults) {
 
     @SuppressWarnings("unchecked")
     @Override
-    @Transactional(readOnly = true, propagation = Propagation.REQUIRED)
     public List<E> getAll() {
         return entityManager.createQuery("from " + clazz.getSimpleName()).getResultList();
     }
diff --git a/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/IdentifierTypeDaoImpl.java b/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/IdentifierTypeDaoImpl.java
@@ -6,10 +6,8 @@
 
 import org.orcid.persistence.dao.IdentifierTypeDao;
 import org.orcid.persistence.jpa.entities.IdentifierTypeEntity;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-@Transactional(readOnly = true, propagation = Propagation.REQUIRED)
 public class IdentifierTypeDaoImpl extends GenericDaoImpl<IdentifierTypeEntity, Long> implements IdentifierTypeDao {
 
     public IdentifierTypeDaoImpl() {
diff --git a/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/NotificationDaoImpl.java b/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/NotificationDaoImpl.java
@@ -17,15 +17,13 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 
  * @author Will Simpson
  * 
  */
-@Transactional(readOnly = true, propagation = Propagation.REQUIRED)
 public class NotificationDaoImpl extends GenericDaoImpl<NotificationEntity, Long> implements NotificationDao {
 
     private static final String NOTIFICATION_TYPE_PERMISSION = "PERMISSION";
@@ -299,7 +297,6 @@ public List<NotificationEntity> findUnsentTips(int batchSize) {
     }
     
     @Override
-    @Transactional
     public void flagAsSendable(String orcid, Long id) {
         Query query = entityManager.createQuery("update NotificationEntity n set n.sendable=true where n.orcid = :orcid and n.id = :id");
         query.setParameter("orcid", orcid);
@@ -308,7 +305,6 @@ public void flagAsSendable(String orcid, Long id) {
     }
     
     @Override
-    @Transactional
     public void flagAsNonSendable(String orcid, Long id) {
         Query query = entityManager.createQuery("update NotificationEntity n set n.sendable=false where n.orcid = :orcid and n.id = :id");
         query.setParameter("orcid", orcid);
@@ -317,7 +313,6 @@ public void flagAsNonSendable(String orcid, Long id) {
     }    
     
     @Override
-    @Transactional
     public void updateRetryCount(String orcid, Long id, Long retryCount) {
         Query query = entityManager.createQuery("update NotificationEntity n set n.retryCount = :count where n.orcid = :orcid and n.id = :id");
         query.setParameter("count", retryCount);
diff --git a/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/OrgAffiliationRelationDaoImpl.java b/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/OrgAffiliationRelationDaoImpl.java
@@ -20,10 +20,8 @@
 import org.orcid.persistence.jpa.entities.OrgAffiliationRelationEntity;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.Cacheable;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-@Transactional(readOnly = true, propagation = Propagation.REQUIRED)
 public class OrgAffiliationRelationDaoImpl extends GenericDaoImpl<OrgAffiliationRelationEntity, Long> implements OrgAffiliationRelationDao {
 
     private static final Logger LOG = LoggerFactory.getLogger(OrgAffiliationRelationDaoImpl.class);
diff --git a/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/OrgDaoImpl.java b/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/OrgDaoImpl.java
@@ -18,7 +18,6 @@
  * @author Will Simpson
  * 
  */
-@Transactional(readOnly = true, propagation = Propagation.REQUIRED)
 public class OrgDaoImpl extends GenericDaoImpl<OrgEntity, Long> implements OrgDao {
 
     public OrgDaoImpl() {
diff --git a/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/OrgDisambiguatedDaoImpl.java b/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/OrgDisambiguatedDaoImpl.java
@@ -15,15 +15,13 @@
 import org.orcid.persistence.jpa.entities.OrgDisambiguatedEntity;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.Cacheable;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 
  * @author Will Simpson
  * 
  */
-@Transactional(readOnly = true, propagation = Propagation.REQUIRED)
 public class OrgDisambiguatedDaoImpl extends GenericDaoImpl<OrgDisambiguatedEntity, Long> implements OrgDisambiguatedDao {
     
     @Value("${org.orcid.core.orgsToGroup.query:select * from org_disambiguated where source_type='ROR'}" )
diff --git a/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/PeerReviewDaoImpl.java b/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/PeerReviewDaoImpl.java
@@ -13,10 +13,8 @@
 import org.orcid.persistence.dao.PeerReviewDao;
 import org.orcid.persistence.jpa.entities.PeerReviewEntity;
 import org.springframework.cache.annotation.Cacheable;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-@Transactional(readOnly = true, propagation = Propagation.REQUIRED)
 public class PeerReviewDaoImpl extends GenericDaoImpl<PeerReviewEntity, Long> implements PeerReviewDao {
 
     public PeerReviewDaoImpl() {
diff --git a/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/ProfileDaoImpl.java b/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/ProfileDaoImpl.java
@@ -28,7 +28,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 public class ProfileDaoImpl extends GenericDaoImpl<ProfileEntity, String> implements ProfileDao {
@@ -309,7 +308,6 @@ public List<String> findOrcidsNeedingEmailMigration(int maxResults) {
     }
 
     @Override
-    @Transactional(readOnly = true, propagation = Propagation.REQUIRED)
     public List<ProfileEntity> findProfilesThatMissedIndexing(int maxResults) {
         TypedQuery<ProfileEntity> query = entityManager.createQuery(
                 "from ProfileEntity where (lastModified > lastIndexedDate or lastIndexedDate is null) and indexingStatus not in ('PENDING', 'IGNORE') order by lastModified",
@@ -756,15 +754,13 @@ public List<ProfileEventEntity> getProfileEvents(String orcid, List<ProfileEvent
     }
 
     @Override
-    @Transactional(readOnly = true, propagation = Propagation.REQUIRED)
     public ProfileEntity getLockedReason(String orcid) {
         TypedQuery<ProfileEntity> query = entityManager.createQuery("FROM ProfileEntity where orcid = :orcid", ProfileEntity.class);
         query.setParameter("orcid", orcid);
         return query.getSingleResult();
     }
 
     @Override
-    @Transactional(readOnly = true, propagation = Propagation.REQUIRED)
     public List<ProfileEntity> findByOrcidType(String orcidType) {
         TypedQuery<ProfileEntity> query = entityManager.createQuery("FROM ProfileEntity where orcidType = :orcidType", ProfileEntity.class);
         query.setParameter("orcidType", orcidType);
diff --git a/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/ProfileFundingDaoImpl.java b/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/ProfileFundingDaoImpl.java
@@ -12,10 +12,8 @@
 import org.orcid.persistence.dao.ProfileFundingDao;
 import org.orcid.persistence.jpa.entities.ProfileFundingEntity;
 import org.springframework.cache.annotation.Cacheable;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-@Transactional(readOnly = true, propagation = Propagation.REQUIRED)
 public class ProfileFundingDaoImpl extends GenericDaoImpl<ProfileFundingEntity, Long> implements ProfileFundingDao {
 
     public ProfileFundingDaoImpl() {
diff --git a/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/ResearchResourceDaoImpl.java b/orcid-persistence/src/main/java/org/orcid/persistence/dao/impl/ResearchResourceDaoImpl.java
@@ -12,10 +12,8 @@
 import org.orcid.persistence.aop.UpdateProfileLastModifiedAndIndexingStatus;
 import org.orcid.persistence.dao.ResearchResourceDao;
 import org.orcid.persistence.jpa.entities.ResearchResourceEntity;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-@Transactional(readOnly = true, propagation = Propagation.REQUIRED)
 public class ResearchResourceDaoImpl extends GenericDaoImpl<ResearchResourceEntity, Long> implements ResearchResourceDao{
 
     public ResearchResourceDaoImpl() {
diff --git a/orcid-persistence/src/main/java/org/orcid/persistence/jpa/entities/ClientDetailsEntity.java b/orcid-persistence/src/main/java/org/orcid/persistence/jpa/entities/ClientDetailsEntity.java
diff --git a/orcid-persistence/src/main/java/org/orcid/persistence/jpa/entities/EmailDomainToOrgIdEntity.java b/orcid-persistence/src/main/java/org/orcid/persistence/jpa/entities/EmailDomainToOrgIdEntity.java
diff --git a/orcid-persistence/src/main/java/org/orcid/persistence/jpa/entities/IdentityProviderNameEntity.java b/orcid-persistence/src/main/java/org/orcid/persistence/jpa/entities/IdentityProviderNameEntity.java
diff --git a/orcid-persistence/src/main/java/org/orcid/persistence/jpa/entities/NotificationWorkEntity.java b/orcid-persistence/src/main/java/org/orcid/persistence/jpa/entities/NotificationWorkEntity.java
diff --git a/orcid-persistence/src/main/java/org/orcid/persistence/jpa/entities/OrgDisambiguatedEntity.java b/orcid-persistence/src/main/java/org/orcid/persistence/jpa/entities/OrgDisambiguatedEntity.java
diff --git a/orcid-persistence/src/main/java/org/orcid/persistence/jpa/entities/ResearchResourceEntity.java b/orcid-persistence/src/main/java/org/orcid/persistence/jpa/entities/ResearchResourceEntity.java
diff --git a/orcid-persistence/src/main/java/org/orcid/persistence/jpa/entities/ResearchResourceItemEntity.java b/orcid-persistence/src/main/java/org/orcid/persistence/jpa/entities/ResearchResourceItemEntity.java

Original file line number	Diff line number	Diff line change
`@@ -28,15 +28,12 @@`
`28`	`28`	`import org.slf4j.Logger;`
`29`	`29`	`import org.slf4j.LoggerFactory;`
`30`	`30`	`import org.springframework.cache.annotation.Cacheable;`
`31`		`-import org.springframework.transaction.annotation.Propagation;`
`32`		`-import org.springframework.transaction.annotation.Transactional;`
`33`	`31`
`34`	`32`	`/**`
`35`	`33`	`*`
`36`	`34`	`* @author Will Simpson`
`37`	`35`	`*`
`38`	`36`	`*/`
`39`		`-@Transactional(readOnly = true, propagation = Propagation.REQUIRED)`
`40`	`37`	`public class EmailManagerReadOnlyImpl extends ManagerReadOnlyBaseImpl implements EmailManagerReadOnly {`
`41`	`38`	`private static final Logger LOGGER = LoggerFactory.getLogger(EmailManagerReadOnlyImpl.class);`
`42`	`39`