Index: .idea/sonarIssues.xml =================================================================== diff -u -re8502f51eef7a4a743c8772d536738c1ba4d5362 -rbfa42730cc8fc4cfc184930b61c568fb1f6038d4 --- .idea/sonarIssues.xml (.../sonarIssues.xml) (revision e8502f51eef7a4a743c8772d536738c1ba4d5362) +++ .idea/sonarIssues.xml (.../sonarIssues.xml) (revision bfa42730cc8fc4cfc184930b61c568fb1f6038d4) @@ -1253,6 +1253,16 @@ + + + + + + + + + + Index: standard/project/web/src/main/java/egovframework/api/rivalWar/aggregateResult/service/AggregateResultServiceImpl.java =================================================================== diff -u -re8502f51eef7a4a743c8772d536738c1ba4d5362 -rbfa42730cc8fc4cfc184930b61c568fb1f6038d4 --- standard/project/web/src/main/java/egovframework/api/rivalWar/aggregateResult/service/AggregateResultServiceImpl.java (.../AggregateResultServiceImpl.java) (revision e8502f51eef7a4a743c8772d536738c1ba4d5362) +++ standard/project/web/src/main/java/egovframework/api/rivalWar/aggregateResult/service/AggregateResultServiceImpl.java (.../AggregateResultServiceImpl.java) (revision bfa42730cc8fc4cfc184930b61c568fb1f6038d4) @@ -1,68 +1,13 @@ package egovframework.api.rivalWar.aggregateResult.service; -import egovframework.com.ext.jstree.springHibernate.core.service.JsTreeHibernateService; -import egovframework.com.ext.jstree.springHibernate.core.vo.JsTreeHibernateSearchDTO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; +import egovframework.com.ext.jstree.springHibernate.core.service.JsTreeHibernateServiceImpl; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; -import java.util.List; - /** * Created by Administrator on 2017-08-29. */ @Service("AggregateResultService") -public class AggregateResultServiceImpl implements AggregateResultService { +public class AggregateResultServiceImpl extends JsTreeHibernateServiceImpl implements AggregateResultService { - @Autowired - @Qualifier("JsTreeHibernateService") - private JsTreeHibernateService jsTreeHibernateService; - - @Override - public T getNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.getNode(jsTreeHibernateDTO); - } - - @Override - public List getChildNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.getChildNode(jsTreeHibernateDTO); - } - - @Override - public List getPaginatedChildNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.getPaginatedChildNode(jsTreeHibernateDTO); - } - - @Override - public List searchNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.searchNode(jsTreeHibernateDTO); - } - - @Override - public T addNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.addNode(jsTreeHibernateDTO); - } - - @Override - public int removeNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.removeNode(jsTreeHibernateDTO); - } - - @Override - public int alterNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.alterNode(jsTreeHibernateDTO); - } - - @Override - public int alterNodeType(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.alterNodeType(jsTreeHibernateDTO); - } - - @Override - public T moveNode(T jsTreeHibernateDTO, HttpServletRequest request) - throws Exception { - return jsTreeHibernateService.moveNode(jsTreeHibernateDTO, request); - } } \ No newline at end of file Index: standard/project/web/src/main/java/egovframework/api/rivalWar/compareInfo/service/CompareInfoServiceImpl.java =================================================================== diff -u -re8502f51eef7a4a743c8772d536738c1ba4d5362 -rbfa42730cc8fc4cfc184930b61c568fb1f6038d4 --- standard/project/web/src/main/java/egovframework/api/rivalWar/compareInfo/service/CompareInfoServiceImpl.java (.../CompareInfoServiceImpl.java) (revision e8502f51eef7a4a743c8772d536738c1ba4d5362) +++ standard/project/web/src/main/java/egovframework/api/rivalWar/compareInfo/service/CompareInfoServiceImpl.java (.../CompareInfoServiceImpl.java) (revision bfa42730cc8fc4cfc184930b61c568fb1f6038d4) @@ -1,68 +1,12 @@ package egovframework.api.rivalWar.compareInfo.service; -import egovframework.api.rivalWar.aggregateResult.service.AggregateResultService; -import egovframework.com.ext.jstree.springHibernate.core.service.JsTreeHibernateService; -import egovframework.com.ext.jstree.springHibernate.core.vo.JsTreeHibernateSearchDTO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; +import egovframework.com.ext.jstree.springHibernate.core.service.JsTreeHibernateServiceImpl; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; -import java.util.List; - /** * Created by Administrator on 2017-09-03. */ @Service("CompareInfoService") -public class CompareInfoServiceImpl implements CompareInfoService { +public class CompareInfoServiceImpl extends JsTreeHibernateServiceImpl implements CompareInfoService { - @Autowired - @Qualifier("JsTreeHibernateService") - private JsTreeHibernateService jsTreeHibernateService; - - @Override - public T getNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.getNode(jsTreeHibernateDTO); - } - - @Override - public List getChildNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.getChildNode(jsTreeHibernateDTO); - } - - @Override - public List getPaginatedChildNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.getPaginatedChildNode(jsTreeHibernateDTO); - } - - @Override - public List searchNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.searchNode(jsTreeHibernateDTO); - } - - @Override - public T addNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.addNode(jsTreeHibernateDTO); - } - - @Override - public int removeNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.removeNode(jsTreeHibernateDTO); - } - - @Override - public int alterNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.alterNode(jsTreeHibernateDTO); - } - - @Override - public int alterNodeType(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.alterNodeType(jsTreeHibernateDTO); - } - - @Override - public T moveNode(T jsTreeHibernateDTO, HttpServletRequest request) - throws Exception { - return jsTreeHibernateService.moveNode(jsTreeHibernateDTO, request); - } } Index: standard/project/web/src/main/java/egovframework/api/rivalWar/compareItem/service/CompareItemServiceImpl.java =================================================================== diff -u -re8502f51eef7a4a743c8772d536738c1ba4d5362 -rbfa42730cc8fc4cfc184930b61c568fb1f6038d4 --- standard/project/web/src/main/java/egovframework/api/rivalWar/compareItem/service/CompareItemServiceImpl.java (.../CompareItemServiceImpl.java) (revision e8502f51eef7a4a743c8772d536738c1ba4d5362) +++ standard/project/web/src/main/java/egovframework/api/rivalWar/compareItem/service/CompareItemServiceImpl.java (.../CompareItemServiceImpl.java) (revision bfa42730cc8fc4cfc184930b61c568fb1f6038d4) @@ -1,68 +1,12 @@ package egovframework.api.rivalWar.compareItem.service; -import egovframework.api.rivalWar.menu.service.MenuService; -import egovframework.com.ext.jstree.springHibernate.core.service.JsTreeHibernateService; -import egovframework.com.ext.jstree.springHibernate.core.vo.JsTreeHibernateSearchDTO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; +import egovframework.com.ext.jstree.springHibernate.core.service.JsTreeHibernateServiceImpl; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; -import java.util.List; - /** * Created by Administrator on 2017-10-08. */ @Service("CompareItemService") -public class CompareItemServiceImpl implements CompareItemService { +public class CompareItemServiceImpl extends JsTreeHibernateServiceImpl implements CompareItemService { - @Autowired - @Qualifier("JsTreeHibernateService") - private JsTreeHibernateService jsTreeHibernateService; - - @Override - public T getNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.getNode(jsTreeHibernateDTO); - } - - @Override - public List getChildNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.getChildNode(jsTreeHibernateDTO); - } - - @Override - public List getPaginatedChildNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.getPaginatedChildNode(jsTreeHibernateDTO); - } - - @Override - public List searchNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.searchNode(jsTreeHibernateDTO); - } - - @Override - public T addNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.addNode(jsTreeHibernateDTO); - } - - @Override - public int removeNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.removeNode(jsTreeHibernateDTO); - } - - @Override - public int alterNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.alterNode(jsTreeHibernateDTO); - } - - @Override - public int alterNodeType(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.alterNodeType(jsTreeHibernateDTO); - } - - @Override - public T moveNode(T jsTreeHibernateDTO, HttpServletRequest request) - throws Exception { - return jsTreeHibernateService.moveNode(jsTreeHibernateDTO, request); - } } Index: standard/project/web/src/main/java/egovframework/api/rivalWar/compareSpec/service/CompareSpecServiceImpl.java =================================================================== diff -u -re8502f51eef7a4a743c8772d536738c1ba4d5362 -rbfa42730cc8fc4cfc184930b61c568fb1f6038d4 --- standard/project/web/src/main/java/egovframework/api/rivalWar/compareSpec/service/CompareSpecServiceImpl.java (.../CompareSpecServiceImpl.java) (revision e8502f51eef7a4a743c8772d536738c1ba4d5362) +++ standard/project/web/src/main/java/egovframework/api/rivalWar/compareSpec/service/CompareSpecServiceImpl.java (.../CompareSpecServiceImpl.java) (revision bfa42730cc8fc4cfc184930b61c568fb1f6038d4) @@ -1,68 +1,12 @@ package egovframework.api.rivalWar.compareSpec.service; -import egovframework.api.rivalWar.compareInfo.service.CompareInfoService; -import egovframework.com.ext.jstree.springHibernate.core.service.JsTreeHibernateService; -import egovframework.com.ext.jstree.springHibernate.core.vo.JsTreeHibernateSearchDTO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; +import egovframework.com.ext.jstree.springHibernate.core.service.JsTreeHibernateServiceImpl; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; -import java.util.List; - /** * Created by Administrator on 2017-09-13. */ @Service("CompareSpecService") -public class CompareSpecServiceImpl implements CompareSpecService { +public class CompareSpecServiceImpl extends JsTreeHibernateServiceImpl implements CompareSpecService { - @Autowired - @Qualifier("JsTreeHibernateService") - private JsTreeHibernateService jsTreeHibernateService; - - @Override - public T getNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.getNode(jsTreeHibernateDTO); - } - - @Override - public List getChildNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.getChildNode(jsTreeHibernateDTO); - } - - @Override - public List getPaginatedChildNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.getPaginatedChildNode(jsTreeHibernateDTO); - } - - @Override - public List searchNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.searchNode(jsTreeHibernateDTO); - } - - @Override - public T addNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.addNode(jsTreeHibernateDTO); - } - - @Override - public int removeNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.removeNode(jsTreeHibernateDTO); - } - - @Override - public int alterNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.alterNode(jsTreeHibernateDTO); - } - - @Override - public int alterNodeType(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.alterNodeType(jsTreeHibernateDTO); - } - - @Override - public T moveNode(T jsTreeHibernateDTO, HttpServletRequest request) - throws Exception { - return jsTreeHibernateService.moveNode(jsTreeHibernateDTO, request); - } } Index: standard/project/web/src/main/java/egovframework/api/rivalWar/directChat/service/DirectChatServiceImpl.java =================================================================== diff -u -re8502f51eef7a4a743c8772d536738c1ba4d5362 -rbfa42730cc8fc4cfc184930b61c568fb1f6038d4 --- standard/project/web/src/main/java/egovframework/api/rivalWar/directChat/service/DirectChatServiceImpl.java (.../DirectChatServiceImpl.java) (revision e8502f51eef7a4a743c8772d536738c1ba4d5362) +++ standard/project/web/src/main/java/egovframework/api/rivalWar/directChat/service/DirectChatServiceImpl.java (.../DirectChatServiceImpl.java) (revision bfa42730cc8fc4cfc184930b61c568fb1f6038d4) @@ -1,64 +1,9 @@ package egovframework.api.rivalWar.directChat.service; -import egovframework.com.ext.jstree.springHibernate.core.service.JsTreeHibernateService; -import egovframework.com.ext.jstree.springHibernate.core.vo.JsTreeHibernateSearchDTO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; +import egovframework.com.ext.jstree.springHibernate.core.service.JsTreeHibernateServiceImpl; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; -import java.util.List; - @Service("DirectChatService") -public class DirectChatServiceImpl implements DirectChatService { +public class DirectChatServiceImpl extends JsTreeHibernateServiceImpl implements DirectChatService { - @Autowired - @Qualifier("JsTreeHibernateService") - private JsTreeHibernateService jsTreeHibernateService; - - @Override - public T getNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.getNode(jsTreeHibernateDTO); - } - - @Override - public List getChildNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.getChildNode(jsTreeHibernateDTO); - } - - @Override - public List getPaginatedChildNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.getPaginatedChildNode(jsTreeHibernateDTO); - } - - @Override - public List searchNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.searchNode(jsTreeHibernateDTO); - } - - @Override - public T addNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.addNode(jsTreeHibernateDTO); - } - - @Override - public int removeNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.removeNode(jsTreeHibernateDTO); - } - - @Override - public int alterNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.alterNode(jsTreeHibernateDTO); - } - - @Override - public int alterNodeType(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.alterNodeType(jsTreeHibernateDTO); - } - - @Override - public T moveNode(T jsTreeHibernateDTO, HttpServletRequest request) - throws Exception { - return jsTreeHibernateService.moveNode(jsTreeHibernateDTO, request); - } } \ No newline at end of file Index: standard/project/web/src/main/java/egovframework/api/rivalWar/menu/service/MenuServiceImpl.java =================================================================== diff -u -re8502f51eef7a4a743c8772d536738c1ba4d5362 -rbfa42730cc8fc4cfc184930b61c568fb1f6038d4 --- standard/project/web/src/main/java/egovframework/api/rivalWar/menu/service/MenuServiceImpl.java (.../MenuServiceImpl.java) (revision e8502f51eef7a4a743c8772d536738c1ba4d5362) +++ standard/project/web/src/main/java/egovframework/api/rivalWar/menu/service/MenuServiceImpl.java (.../MenuServiceImpl.java) (revision bfa42730cc8fc4cfc184930b61c568fb1f6038d4) @@ -1,64 +1,9 @@ package egovframework.api.rivalWar.menu.service; -import egovframework.com.ext.jstree.springHibernate.core.service.JsTreeHibernateService; -import egovframework.com.ext.jstree.springHibernate.core.vo.JsTreeHibernateSearchDTO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; +import egovframework.com.ext.jstree.springHibernate.core.service.JsTreeHibernateServiceImpl; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; -import java.util.List; - @Service("MenuService") -public class MenuServiceImpl implements MenuService { +public class MenuServiceImpl extends JsTreeHibernateServiceImpl implements MenuService { - @Autowired - @Qualifier("JsTreeHibernateService") - private JsTreeHibernateService jsTreeHibernateService; - - @Override - public T getNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.getNode(jsTreeHibernateDTO); - } - - @Override - public List getChildNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.getChildNode(jsTreeHibernateDTO); - } - - @Override - public List getPaginatedChildNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.getPaginatedChildNode(jsTreeHibernateDTO); - } - - @Override - public List searchNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.searchNode(jsTreeHibernateDTO); - } - - @Override - public T addNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.addNode(jsTreeHibernateDTO); - } - - @Override - public int removeNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.removeNode(jsTreeHibernateDTO); - } - - @Override - public int alterNode(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.alterNode(jsTreeHibernateDTO); - } - - @Override - public int alterNodeType(T jsTreeHibernateDTO) throws Exception { - return jsTreeHibernateService.alterNodeType(jsTreeHibernateDTO); - } - - @Override - public T moveNode(T jsTreeHibernateDTO, HttpServletRequest request) - throws Exception { - return jsTreeHibernateService.moveNode(jsTreeHibernateDTO, request); - } } \ No newline at end of file Index: standard/project/web/src/main/java/egovframework/api/rivalWar/specHashTag/service/SpecHashTagServiceImple.java =================================================================== diff -u -re8502f51eef7a4a743c8772d536738c1ba4d5362 -rbfa42730cc8fc4cfc184930b61c568fb1f6038d4 --- standard/project/web/src/main/java/egovframework/api/rivalWar/specHashTag/service/SpecHashTagServiceImple.java (.../SpecHashTagServiceImple.java) (revision e8502f51eef7a4a743c8772d536738c1ba4d5362) +++ standard/project/web/src/main/java/egovframework/api/rivalWar/specHashTag/service/SpecHashTagServiceImple.java (.../SpecHashTagServiceImple.java) (revision bfa42730cc8fc4cfc184930b61c568fb1f6038d4) @@ -1,6 +1,7 @@ package egovframework.api.rivalWar.specHashTag.service; import egovframework.com.ext.jstree.springHibernate.core.service.JsTreeHibernateService; +import egovframework.com.ext.jstree.springHibernate.core.service.JsTreeHibernateServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; @@ -9,8 +10,5 @@ * Created by Administrator on 2017-10-14. */ @Service("SpecHashTagService") -public class SpecHashTagServiceImple { - @Autowired - @Qualifier("JsTreeHibernateService") - private JsTreeHibernateService jsTreeHibernateService; +public class SpecHashTagServiceImple extends JsTreeHibernateServiceImpl implements SpecHashTagService { } Index: standard/project/web/src/main/java/egovframework/api/rivalWar/userSelectedItem/service/UserSelectedItemService.java =================================================================== diff -u -r5b58dcdc464fb120bff3c7d4a19b7771ac8095d8 -rbfa42730cc8fc4cfc184930b61c568fb1f6038d4 --- standard/project/web/src/main/java/egovframework/api/rivalWar/userSelectedItem/service/UserSelectedItemService.java (.../UserSelectedItemService.java) (revision 5b58dcdc464fb120bff3c7d4a19b7771ac8095d8) +++ standard/project/web/src/main/java/egovframework/api/rivalWar/userSelectedItem/service/UserSelectedItemService.java (.../UserSelectedItemService.java) (revision bfa42730cc8fc4cfc184930b61c568fb1f6038d4) @@ -1,7 +1,9 @@ package egovframework.api.rivalWar.userSelectedItem.service; +import egovframework.com.ext.jstree.springHibernate.core.service.JsTreeHibernateService; + /** * Created by Administrator on 2017-10-14. */ -public class UserSelectedItemService { +public interface UserSelectedItemService extends JsTreeHibernateService { } Index: standard/project/web/src/main/java/egovframework/api/rivalWar/userSelectedItem/service/UserSelectedItemServiceImpl.java =================================================================== diff -u -r5b58dcdc464fb120bff3c7d4a19b7771ac8095d8 -rbfa42730cc8fc4cfc184930b61c568fb1f6038d4 --- standard/project/web/src/main/java/egovframework/api/rivalWar/userSelectedItem/service/UserSelectedItemServiceImpl.java (.../UserSelectedItemServiceImpl.java) (revision 5b58dcdc464fb120bff3c7d4a19b7771ac8095d8) +++ standard/project/web/src/main/java/egovframework/api/rivalWar/userSelectedItem/service/UserSelectedItemServiceImpl.java (.../UserSelectedItemServiceImpl.java) (revision bfa42730cc8fc4cfc184930b61c568fb1f6038d4) @@ -1,7 +1,12 @@ package egovframework.api.rivalWar.userSelectedItem.service; +import egovframework.com.ext.jstree.springHibernate.core.service.JsTreeHibernateServiceImpl; +import org.springframework.stereotype.Service; + /** * Created by Administrator on 2017-10-14. */ -public class UserSelectedItemServiceImpl { +@Service("UserSelectedItemService") +public class UserSelectedItemServiceImpl extends JsTreeHibernateServiceImpl implements UserSelectedItemService{ + }