Index: core-module/pom.xml =================================================================== diff -u -r74aebf67e07b10eace3ad4c1f5a44f3c393ddd35 -ra860a067bfb381d1e8a40d046e5b618b17697dce --- core-module/pom.xml (.../pom.xml) (revision 74aebf67e07b10eace3ad4c1f5a44f3c393ddd35) +++ core-module/pom.xml (.../pom.xml) (revision a860a067bfb381d1e8a40d046e5b618b17697dce) @@ -7,7 +7,7 @@ 313devgrp java-service-tree-framework-core-library - 23.01.03 + 23.01.04 ../pom.xml @@ -31,7 +31,7 @@ 313devgrp lib-module - 23.01.03 + 23.01.04 pom Index: core-module/src/main/java/egovframework/com/ext/jstree/springHibernate/core/service/JsTreeHibernateServiceImpl.java =================================================================== diff -u -rbdb1e599ecf1b278f8b89c1acc44eef28acfade3 -ra860a067bfb381d1e8a40d046e5b618b17697dce --- core-module/src/main/java/egovframework/com/ext/jstree/springHibernate/core/service/JsTreeHibernateServiceImpl.java (.../JsTreeHibernateServiceImpl.java) (revision bdb1e599ecf1b278f8b89c1acc44eef28acfade3) +++ core-module/src/main/java/egovframework/com/ext/jstree/springHibernate/core/service/JsTreeHibernateServiceImpl.java (.../JsTreeHibernateServiceImpl.java) (revision a860a067bfb381d1e8a40d046e5b618b17697dce) @@ -13,6 +13,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; @@ -35,7 +36,6 @@ @SuppressWarnings("unchecked") @Override - @Transactional(rollbackFor = { Exception.class }, propagation = Propagation.REQUIRED) public T getNode(T jsTreeHibernateDTO) throws Exception { logger.info("getNode"); jsTreeHibernateDao.setClazz(jsTreeHibernateDTO.getClass()); @@ -46,7 +46,6 @@ @SuppressWarnings("unchecked") @Override - @Transactional(rollbackFor = { Exception.class }, propagation = Propagation.REQUIRED) public List getChildNode(T jsTreeHibernateDTO) throws Exception { jsTreeHibernateDao.setClazz(jsTreeHibernateDTO.getClass()); jsTreeHibernateDTO.setOrder(Order.asc("c_position")); @@ -56,7 +55,6 @@ @SuppressWarnings("unchecked") @Override - @Transactional(rollbackFor = { Exception.class }, propagation = Propagation.REQUIRED) public List getPaginatedChildNode(T jsTreeHibernateDTO) throws Exception { /** paging */ @@ -77,7 +75,6 @@ @SuppressWarnings("unchecked") @Override - @Transactional(rollbackFor = { Exception.class }, propagation = Propagation.REQUIRED) public List searchNode(T jsTreeHibernateDTO) throws Exception { jsTreeHibernateDao.setClazz(jsTreeHibernateDTO.getClass()); jsTreeHibernateDTO.setOrder(Order.asc("c_id")); @@ -92,7 +89,7 @@ @SuppressWarnings("unchecked") @Override - @Transactional(rollbackFor = { Exception.class }, propagation = Propagation.REQUIRED) + @Transactional(rollbackFor = { Exception.class }, isolation = Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED) public T addNode(T jsTreeHibernateDTO) throws Exception { jsTreeHibernateDao.setClazz(jsTreeHibernateDTO.getClass()); @@ -138,7 +135,8 @@ return jsTreeHibernateDTO; } - @Transactional(rollbackFor = { Exception.class }, propagation = Propagation.REQUIRED) + @SuppressWarnings("unchecked") + @Transactional(rollbackFor = { Exception.class }, isolation = Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED) public void stretchLeftRightForMyselfFromJstree(long spaceOfTargetNode, long rightPositionFromNodeByRef, long copy, Collection c_idsByChildNodeFromNodeById, T jsTreeHibernateDTO) throws Exception { @@ -152,7 +150,7 @@ } @SuppressWarnings("unchecked") - @Transactional(rollbackFor = { Exception.class }, propagation = Propagation.REQUIRED) + @Transactional(rollbackFor = { Exception.class }, isolation = Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED) public void stretchRight(long spaceOfTargetNode, long rightPositionFromNodeByRef, long copy, Collection c_idsByChildNodeFromNodeById, DetachedCriteria detachedCriteria) { @@ -179,7 +177,7 @@ } @SuppressWarnings("unchecked") - @Transactional(rollbackFor = { Exception.class }, propagation = Propagation.REQUIRED) + @Transactional(rollbackFor = { Exception.class }, isolation = Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED) public void stretchLeft(long spaceOfTargetNode, long rightPositionFromNodeByRef, long copy, Collection c_idsByChildNodeFromNodeById, DetachedCriteria detachedCriteria) { @@ -224,7 +222,7 @@ @SuppressWarnings("unchecked") @Override - @Transactional(rollbackFor = { Exception.class }, propagation = Propagation.REQUIRED) + @Transactional(rollbackFor = { Exception.class }, isolation = Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED) public int removeNode(T jsTreeHibernateDTO) throws Exception { jsTreeHibernateDao.setClazz(jsTreeHibernateDTO.getClass()); @@ -290,7 +288,7 @@ @SuppressWarnings("unchecked") @Override - @Transactional(rollbackFor = { Exception.class }, propagation = Propagation.REQUIRED) + @Transactional(rollbackFor = { Exception.class }, isolation = Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED) public int updateNode(T jsTreeHibernateDTO) throws Exception { jsTreeHibernateDao.setClazz(jsTreeHibernateDTO.getClass()); @@ -316,7 +314,7 @@ @SuppressWarnings("unchecked") @Override - @Transactional(rollbackFor = { Exception.class }, propagation = Propagation.REQUIRED) + @Transactional(rollbackFor = { Exception.class }, isolation = Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED) public int alterNode(T jsTreeHibernateDTO) throws Exception { jsTreeHibernateDao.setClazz(jsTreeHibernateDTO.getClass()); @@ -329,7 +327,7 @@ @SuppressWarnings("unchecked") @Override - @Transactional(rollbackFor = { Exception.class }, propagation = Propagation.REQUIRED) + @Transactional(rollbackFor = { Exception.class }, isolation = Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED) public int alterNodeType(T jsTreeHibernateDTO) throws Exception { jsTreeHibernateDao.setClazz(jsTreeHibernateDTO.getClass()); @@ -356,7 +354,7 @@ @SuppressWarnings("unchecked") @Override - @Transactional(rollbackFor = { Exception.class }, propagation = Propagation.REQUIRED) + @Transactional(rollbackFor = { Exception.class }, isolation = Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED) public T moveNode(T jsTreeHibernateDTO, HttpServletRequest request) throws Exception { @@ -473,7 +471,7 @@ } @SuppressWarnings("unchecked") - @Transactional(rollbackFor = { Exception.class }, propagation = Propagation.REQUIRED) + @Transactional(rollbackFor = { Exception.class }, isolation = Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED) public void enterMyselfFromJstree(long ref, long c_position, long c_id, long idif, long ldif, Collection c_idsByChildNodeFromNodeById, T jsTreeHibernateDTO) throws Exception { @@ -488,7 +486,7 @@ } @SuppressWarnings("unchecked") - @Transactional(rollbackFor = { Exception.class }, propagation = Propagation.REQUIRED) + @Transactional(rollbackFor = { Exception.class }, isolation = Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED) public void enterMyselfFixLeftRight(long idif, long ldif, Collection c_idsByChildNodeFromNodeById, T jsTreeHibernateDTO) { logger.debug("-----------------------enterMyselfFixLeftRight-----------------------"); @@ -512,7 +510,7 @@ } @SuppressWarnings("unchecked") - @Transactional(rollbackFor = { Exception.class }, propagation = Propagation.REQUIRED) + @Transactional(rollbackFor = { Exception.class }, isolation = Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED) public void fixPositionParentIdOfCopyNodes(long insertSeqResult, long position, T jsTreeHibernateDTO) throws Exception { @@ -566,7 +564,7 @@ } @SuppressWarnings("unchecked") - @Transactional(rollbackFor = { Exception.class }, propagation = Propagation.REQUIRED) + @Transactional(rollbackFor = { Exception.class }, isolation = Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED) public long pasteMyselfFromJstree(long ref, long idif, long spaceOfTargetNode, long ldif, Collection c_idsByChildNodeFromNodeById, long rightPositionFromNodeByRef, T nodeById) throws Exception { @@ -627,7 +625,7 @@ } @SuppressWarnings("unchecked") - @Transactional(rollbackFor = { Exception.class }, propagation = Propagation.REQUIRED) + @Transactional(rollbackFor = { Exception.class }, isolation = Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED) public void stretchPositionForMyselfFromJstree( Collection c_idsByChildNodeFromNodeById, T jsTreeHibernateDTO) throws Exception { @@ -787,7 +785,7 @@ } @SuppressWarnings("unchecked") - @Transactional(rollbackFor = { Exception.class }, propagation = Propagation.REQUIRED) + @Transactional(rollbackFor = { Exception.class }, isolation = Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED) public void cutMyself(T nodeById, long spaceOfTargetNode, Collection c_idsByChildNodeFromNodeById) throws Exception { Index: lib-module/pom.xml =================================================================== diff -u -r74aebf67e07b10eace3ad4c1f5a44f3c393ddd35 -ra860a067bfb381d1e8a40d046e5b618b17697dce --- lib-module/pom.xml (.../pom.xml) (revision 74aebf67e07b10eace3ad4c1f5a44f3c393ddd35) +++ lib-module/pom.xml (.../pom.xml) (revision a860a067bfb381d1e8a40d046e5b618b17697dce) @@ -5,7 +5,7 @@ 313devgrp java-service-tree-framework-core-library - 23.01.03 + 23.01.04 ../pom.xml Index: pom.xml =================================================================== diff -u -r74aebf67e07b10eace3ad4c1f5a44f3c393ddd35 -ra860a067bfb381d1e8a40d046e5b618b17697dce --- pom.xml (.../pom.xml) (revision 74aebf67e07b10eace3ad4c1f5a44f3c393ddd35) +++ pom.xml (.../pom.xml) (revision a860a067bfb381d1e8a40d046e5b618b17697dce) @@ -10,7 +10,7 @@ 4.0.0 313devgrp java-service-tree-framework-core-library - 23.01.03 + 23.01.04 pom java-service-tree-framework-core-library