From 68116ed63884e3d404dda54cb9b2c20be07880fe Mon Sep 17 00:00:00 2001 From: gdesiato Date: Mon, 3 Feb 2025 17:03:56 +0100 Subject: [PATCH] refactoring logicaldoc-core with @Resources annotations --- .../conversion/FormatConverterManager.java | 26 ++++---- .../core/document/DigestProcessor.java | 11 ++-- .../core/document/DocumentManagerImpl.java | 59 ++++++++----------- .../document/HibernateDocumentHistoryDAO.java | 7 +-- .../core/document/HibernateVersionDAO.java | 14 ++--- .../core/document/TagsProcessor.java | 11 ++-- .../core/folder/HibernateFolderDAO.java | 23 ++++---- .../folder/HibernateFolderHistoryDAO.java | 7 +-- .../core/folder/PathCalculator.java | 12 ++-- .../core/history/HibernateHistoryDAO.java | 10 ++-- .../com/logicaldoc/core/job/JobManager.java | 16 ++--- .../com/logicaldoc/core/lock/LockManager.java | 16 ++--- .../metadata/HibernateAttributeSetDAO.java | 14 ++--- .../core/metadata/HibernateTemplateDAO.java | 10 ++-- .../core/searchengine/IndexOptimizer.java | 14 ++--- .../core/searchengine/IndexerTask.java | 23 ++++---- .../core/security/SessionManager.java | 21 ++++--- .../authentication/ApiKeyAuthenticator.java | 11 +--- .../authentication/DefaultAuthenticator.java | 10 +--- .../core/security/menu/HibernateMenuDAO.java | 9 +-- .../user/HibernateUserHistoryDAO.java | 7 +-- .../core/system/SystemLoadMonitor.java | 11 +--- .../com/logicaldoc/core/task/TaskTrigger.java | 9 +-- .../core/threading/ThreadPools.java | 10 +--- 24 files changed, 161 insertions(+), 200 deletions(-) diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/conversion/FormatConverterManager.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/conversion/FormatConverterManager.java index ea5b03d0e..41f60d422 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/conversion/FormatConverterManager.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/conversion/FormatConverterManager.java @@ -10,11 +10,12 @@ import java.util.List; import java.util.Map; +import javax.annotation.Resource; + import org.apache.commons.lang.StringUtils; import org.java.plugin.registry.Extension; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.logicaldoc.core.PersistenceException; @@ -57,14 +58,17 @@ public class FormatConverterManager { protected static Logger log = LoggerFactory.getLogger(FormatConverterManager.class); - private Store store; - - private TenantDAO tenantDao; + @Resource(name = "Store") + protected Store store; - private DocumentManager documentManager; + @Resource(name = "TenantDAO") + protected TenantDAO tenantDao; - private ContextProperties config; + @Resource(name = "documentManager") + protected DocumentManager documentManager; + @Resource(name = "ContextProperties") + protected ContextProperties config; // Key is the src_extension-dst_extension, value is a collection of // converters private Map> converters = new HashMap<>(); @@ -72,16 +76,6 @@ public class FormatConverterManager { // All the available converters private Map availableConverters = new HashMap<>(); - @Autowired - public FormatConverterManager(Store store, TenantDAO tenantDao, DocumentManager documentManager, - ContextProperties config) { - super(); - this.store = store; - this.tenantDao = tenantDao; - this.documentManager = documentManager; - this.config = config; - } - /** * Retrieves the content of the Pdf conversion. If the Pdf conversion is not * available in the store, it is created. diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/document/DigestProcessor.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/document/DigestProcessor.java index ef32634d0..07441a1b1 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/document/DigestProcessor.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/document/DigestProcessor.java @@ -3,8 +3,9 @@ import java.util.List; import java.util.Locale; +import javax.annotation.Resource; + import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.logicaldoc.core.PersistenceException; @@ -23,19 +24,19 @@ public class DigestProcessor extends Task { public static final String NAME = "DigestProcessor"; - private DocumentDAO documentDao; + @Resource(name = "DocumentDAO") + protected DocumentDAO documentDao; private long processed = 0; private long errors = 0; - @Autowired - public DigestProcessor(DocumentDAO documentDao) { + public DigestProcessor() { super(NAME); log = LoggerFactory.getLogger(DigestProcessor.class); - this.documentDao = documentDao; } + @Override public boolean isIndeterminate() { return false; diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/document/DocumentManagerImpl.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/document/DocumentManagerImpl.java index 2636b4adb..e9413d513 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/document/DocumentManagerImpl.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/document/DocumentManagerImpl.java @@ -22,11 +22,12 @@ import java.util.Set; import java.util.stream.Collectors; +import javax.annotation.Resource; + import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.RowMapper; import org.springframework.stereotype.Component; @@ -90,49 +91,41 @@ public class DocumentManagerImpl implements DocumentManager { protected static Logger log = LoggerFactory.getLogger(DocumentManagerImpl.class); - private DocumentDAO documentDAO; - - private DocumentLinkDAO documentLinkDAO; + @Resource(name = "DocumentDAO") + protected DocumentDAO documentDAO; - private DocumentNoteDAO documentNoteDAO; + @Resource(name = "DocumentLinkDAO") + protected DocumentLinkDAO documentLinkDAO; - private FolderDAO folderDAO; + @Resource(name = "DocumentNoteDAO") + protected DocumentNoteDAO documentNoteDAO; - private TemplateDAO templateDAO; + @Resource(name = "FolderDAO") + protected FolderDAO folderDAO; - private DocumentListenerManager listenerManager; + @Resource(name = "TemplateDAO") + protected TemplateDAO templateDAO; - private VersionDAO versionDAO; + @Resource(name = "documentListenerManager") + protected DocumentListenerManager listenerManager; - private UserDAO userDAO; + @Resource(name = "VersionDAO") + protected VersionDAO versionDAO; - private TicketDAO ticketDAO; + @Resource(name = "UserDAO") + protected UserDAO userDAO; - private SearchEngine indexer; + @Resource(name = "TicketDAO") + protected TicketDAO ticketDAO; - private Store store; + @Resource(name = "SearchEngine") + protected SearchEngine indexer; - private ContextProperties config; + @Resource(name = "Store") + protected Store store; - @Autowired - public DocumentManagerImpl(DocumentDAO documentDAO, DocumentLinkDAO documentLinkDAO, - DocumentNoteDAO documentNoteDAO, FolderDAO folderDAO, TemplateDAO templateDAO, - DocumentListenerManager listenerManager, VersionDAO versionDAO, UserDAO userDAO, TicketDAO ticketDAO, - SearchEngine indexer, Store store, ContextProperties config) { - super(); - this.documentDAO = documentDAO; - this.documentLinkDAO = documentLinkDAO; - this.documentNoteDAO = documentNoteDAO; - this.folderDAO = folderDAO; - this.templateDAO = templateDAO; - this.listenerManager = listenerManager; - this.versionDAO = versionDAO; - this.userDAO = userDAO; - this.ticketDAO = ticketDAO; - this.indexer = indexer; - this.store = store; - this.config = config; - } + @Resource(name = "ContextProperties") + protected ContextProperties config; @Override public void replaceFile(long docId, String fileVersion, InputStream content, DocumentHistory transaction) diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/document/HibernateDocumentHistoryDAO.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/document/HibernateDocumentHistoryDAO.java index a48b5b311..01a0e3b94 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/document/HibernateDocumentHistoryDAO.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/document/HibernateDocumentHistoryDAO.java @@ -8,11 +8,9 @@ import org.apache.commons.lang.StringUtils; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import com.logicaldoc.core.PersistenceException; import com.logicaldoc.core.history.HibernateHistoryDAO; -import com.logicaldoc.util.config.ContextProperties; import com.logicaldoc.util.sql.SqlUtil; /** @@ -29,9 +27,8 @@ public class HibernateDocumentHistoryDAO extends HibernateHistoryDAO i private static final String DOC_ID = ".docId="; - private Store store; + @Resource(name = "Store") + protected Store store; - private FolderDAO folderDAO; + @Resource(name = "FolderDAO") + protected FolderDAO folderDAO; - @Autowired - private HibernateVersionDAO(Store store, FolderDAO folderDAO) { + public HibernateVersionDAO() { super(Version.class); super.log = LoggerFactory.getLogger(HibernateVersionDAO.class); - this.store = store; - this.folderDAO = folderDAO; } @Override diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/document/TagsProcessor.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/document/TagsProcessor.java index dff75d3a6..bcbae6a02 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/document/TagsProcessor.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/document/TagsProcessor.java @@ -1,7 +1,8 @@ package com.logicaldoc.core.document; +import javax.annotation.Resource; + import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.logicaldoc.core.PersistenceException; @@ -20,13 +21,13 @@ public class TagsProcessor extends Task { public static final String NAME = "TagsProcessor"; - private final DocumentDAO documentDao; + @Resource(name = "DocumentDAO") + private DocumentDAO documentDao; + - @Autowired - public TagsProcessor(DocumentDAO documentDao) { + public TagsProcessor() { super(NAME); log = LoggerFactory.getLogger(TagsProcessor.class); - this.documentDao = documentDao; } @Override diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/folder/HibernateFolderDAO.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/folder/HibernateFolderDAO.java index b5a0ac7f0..6c65042e6 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/folder/HibernateFolderDAO.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/folder/HibernateFolderDAO.java @@ -18,9 +18,10 @@ import java.util.StringTokenizer; import java.util.stream.Collectors; +import javax.annotation.Resource; + import org.apache.commons.lang.StringUtils; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.BeanPropertyRowMapper; import org.springframework.jdbc.core.RowMapper; @@ -95,23 +96,21 @@ public class HibernateFolderDAO extends HibernatePersistentObjectDAO imp private static final String WHERE_GROUP_GROUPID_IN = " where _group.groupId in ("; - private UserDAO userDAO; + @Resource(name = "UserDAO") + protected UserDAO userDAO; - private FolderHistoryDAO historyDAO; + @Resource(name = "FolderHistoryDAO") + protected FolderHistoryDAO historyDAO; - private Store store; + @Resource(name = "Store") + protected Store store; - private FolderListenerManager listenerManager; + @Resource(name = "folderListenerManager") + protected FolderListenerManager listenerManager; - @Autowired - protected HibernateFolderDAO(UserDAO userDAO, FolderHistoryDAO historyDAO, Store store, - FolderListenerManager listenerManager) { + public HibernateFolderDAO() { super(Folder.class); super.log = LoggerFactory.getLogger(HibernateFolderDAO.class); - this.userDAO = userDAO; - this.historyDAO = historyDAO; - this.store = store; - this.listenerManager = listenerManager; } @Override diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/folder/HibernateFolderHistoryDAO.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/folder/HibernateFolderHistoryDAO.java index 6eb75e78f..0afd3393d 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/folder/HibernateFolderHistoryDAO.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/folder/HibernateFolderHistoryDAO.java @@ -8,11 +8,9 @@ import org.apache.commons.lang.StringUtils; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import com.logicaldoc.core.PersistenceException; import com.logicaldoc.core.history.HibernateHistoryDAO; -import com.logicaldoc.util.config.ContextProperties; import com.logicaldoc.util.sql.SqlUtil; /** @@ -29,9 +27,8 @@ public class HibernateFolderHistoryDAO extends HibernateHistoryDAO extends HibernatePersistentObjectDAO implements PersistentObjectDAO { - private ContextProperties config; + @Resource(name = "ContextProperties") + protected ContextProperties config; // A cache of tenant names to minimize the DB accesses private static final Map tenantNames = new HashMap<>(); - @Autowired - protected HibernateHistoryDAO(Class historyClass, ContextProperties config) { + protected HibernateHistoryDAO(Class historyClass) { super(historyClass); super.log = LoggerFactory.getLogger(HibernateHistoryDAO.class); - this.config = config; } @Override diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/job/JobManager.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/job/JobManager.java index b9265a07f..dd6062239 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/job/JobManager.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/job/JobManager.java @@ -10,6 +10,8 @@ import java.util.Set; import java.util.stream.Collectors; +import javax.annotation.Resource; + import org.apache.commons.lang3.StringUtils; import org.quartz.CronScheduleBuilder; import org.quartz.JobBuilder; @@ -25,7 +27,6 @@ import org.quartz.impl.matchers.GroupMatcher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.logicaldoc.util.config.ContextProperties; @@ -48,16 +49,11 @@ public class JobManager { protected static Logger log = LoggerFactory.getLogger(JobManager.class); - private Scheduler scheduler; - - private ContextProperties config; + @Resource(name = "Scheduler") + protected Scheduler scheduler; - @Autowired - public JobManager(Scheduler scheduler, ContextProperties config) { - super(); - this.scheduler = scheduler; - this.config = config; - } + @Resource(name = "ContextProperties") + protected ContextProperties config; /** * Schedules a new Job diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/lock/LockManager.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/lock/LockManager.java index 376d15969..9472c751a 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/lock/LockManager.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/lock/LockManager.java @@ -6,9 +6,10 @@ import java.util.GregorianCalendar; import java.util.List; +import javax.annotation.Resource; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.logicaldoc.core.PersistenceException; @@ -29,16 +30,11 @@ public class LockManager { protected Logger log = LoggerFactory.getLogger(LockManager.class); - private GenericDAO genericDao; - - private ContextProperties config; + @Resource(name = "GenericDAO") + protected GenericDAO genericDao; - @Autowired - public LockManager(GenericDAO genericDao, ContextProperties config) { - super(); - this.genericDao = genericDao; - this.config = config; - } + @Resource(name = "ContextProperties") + protected ContextProperties config; /** * Gets all the transaction ids associated to the locks diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/metadata/HibernateAttributeSetDAO.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/metadata/HibernateAttributeSetDAO.java index 4e01d96cb..2851e3e0d 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/metadata/HibernateAttributeSetDAO.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/metadata/HibernateAttributeSetDAO.java @@ -6,9 +6,10 @@ import java.util.Map; import java.util.TreeMap; +import javax.annotation.Resource; + import org.apache.commons.collections.CollectionUtils; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import com.logicaldoc.core.HibernatePersistentObjectDAO; import com.logicaldoc.core.PersistenceException; @@ -26,16 +27,15 @@ public class HibernateAttributeSetDAO extends HibernatePersistentObjectDAO private static final String ORDER_BY = "order by "; - private UserDAO userDAO; + @Resource(name = "UserDAO") + protected UserDAO userDAO; - @Autowired - public HibernateTemplateDAO(UserDAO userDAO) { + public HibernateTemplateDAO() { super(Template.class); super.log = LoggerFactory.getLogger(HibernateTemplateDAO.class); - this.userDAO = userDAO; } @Override diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/searchengine/IndexOptimizer.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/searchengine/IndexOptimizer.java index 8285f118b..6ce0831c6 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/searchengine/IndexOptimizer.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/searchengine/IndexOptimizer.java @@ -2,8 +2,9 @@ import java.util.List; +import javax.annotation.Resource; + import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.logicaldoc.core.PersistenceException; @@ -21,16 +22,15 @@ public class IndexOptimizer extends Task { public static final String NAME = "IndexOptimizer"; - private SearchEngine indexer; + @Resource(name = "SearchEngine") + protected SearchEngine indexer; - private DocumentDAO documentDao; + @Resource(name = "DocumentDAO") + protected DocumentDAO documentDao; - @Autowired - public IndexOptimizer(SearchEngine indexer, DocumentDAO documentDao) { + public IndexOptimizer() { super(NAME); log = LoggerFactory.getLogger(IndexOptimizer.class); - this.indexer = indexer; - this.documentDao = documentDao; } public SearchEngine getIndexer() { diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/searchengine/IndexerTask.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/searchengine/IndexerTask.java index 033031d16..b4bc685e0 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/searchengine/IndexerTask.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/searchengine/IndexerTask.java @@ -13,10 +13,11 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; +import javax.annotation.Resource; + import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.logicaldoc.core.PersistenceException; @@ -57,13 +58,17 @@ public class IndexerTask extends Task { public static final String NAME = "IndexerTask"; - private DocumentManager documentManager; + @Resource(name = "documentManager") + protected DocumentManager documentManager; - private DocumentDAO documentDao; + @Resource(name = "DocumentDAO") + protected DocumentDAO documentDao; - private TenantDAO tenantDao; + @Resource(name = "TenantDAO") + protected TenantDAO tenantDao; - private SearchEngine indexer; + @Resource(name = "SearchEngine") + protected SearchEngine indexer; private long indexed = 0; @@ -73,15 +78,9 @@ public class IndexerTask extends Task { private long parsingTime = 0; - @Autowired - public IndexerTask(DocumentManager documentManager, DocumentDAO documentDao, TenantDAO tenantDao, - SearchEngine indexer) { + public IndexerTask() { super(NAME); log = LoggerFactory.getLogger(IndexerTask.class); - this.documentManager = documentManager; - this.documentDao = documentDao; - this.tenantDao = tenantDao; - this.indexer = indexer; } @Override diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/security/SessionManager.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/security/SessionManager.java index d6a8c83fb..3827644cd 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/security/SessionManager.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/security/SessionManager.java @@ -12,6 +12,7 @@ import java.util.concurrent.ConcurrentHashMap; import javax.annotation.PreDestroy; +import javax.annotation.Resource; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -20,17 +21,18 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; import com.logicaldoc.core.PersistenceException; +import com.logicaldoc.core.security.apikey.ApiKeyDAO; import com.logicaldoc.core.security.authentication.AuthenticationChain; import com.logicaldoc.core.security.authentication.AuthenticationException; import com.logicaldoc.core.security.spring.LDAuthenticationToken; import com.logicaldoc.core.security.spring.LDSecurityContextRepository; import com.logicaldoc.core.security.user.User; +import com.logicaldoc.core.security.user.UserDAO; import com.logicaldoc.util.Context; import com.logicaldoc.util.crypt.CryptUtil; import com.logicaldoc.util.sql.SqlUtil; @@ -57,20 +59,25 @@ public class SessionManager extends ConcurrentHashMap { // The maximum number of closed session maintained in memory private static final int MAX_CLOSED_SESSIONS = 50; - private transient AuthenticationChain authenticationChain; + @Resource(name = "authenticationChain") + protected transient AuthenticationChain authenticationChain; - private transient SessionDAO sessionDao; + @Resource(name = "SessionDAO") + protected transient SessionDAO sessionDao; + + @Resource(name = "ApiKeyDAO") + protected transient ApiKeyDAO apiKeyDao; + + @Resource(name = "UserDAO") + protected transient UserDAO userDao; private transient SessionTimeoutWatchDog timeoutWatchDog = new SessionTimeoutWatchDog(); private transient List listeners = new ArrayList<>(); - @Autowired - private SessionManager(AuthenticationChain authenticationChain, SessionDAO sessionDao) { + public SessionManager() { timeoutWatchDog.start(); log.info("Starting the session timeout watchdog"); - this.authenticationChain = authenticationChain; - this.sessionDao = sessionDao; } public static final SessionManager get() { diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/security/authentication/ApiKeyAuthenticator.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/security/authentication/ApiKeyAuthenticator.java index d8c545629..8434973f9 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/security/authentication/ApiKeyAuthenticator.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/security/authentication/ApiKeyAuthenticator.java @@ -4,10 +4,11 @@ import java.util.Date; import java.util.Map; +import javax.annotation.Resource; + import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.logicaldoc.core.PersistenceException; @@ -15,7 +16,6 @@ import com.logicaldoc.core.security.apikey.ApiKey; import com.logicaldoc.core.security.apikey.ApiKeyDAO; import com.logicaldoc.core.security.user.User; -import com.logicaldoc.core.security.user.UserDAO; /** * This authenticator uses the API Key @@ -28,14 +28,9 @@ public class ApiKeyAuthenticator extends DefaultAuthenticator { protected static Logger log = LoggerFactory.getLogger(ApiKeyAuthenticator.class); + @Resource(name = "ApiKeyDAO") protected ApiKeyDAO apiKeyDAO; - @Autowired - public ApiKeyAuthenticator(UserDAO userDAO, ApiKeyDAO apiKeyDAO) { - super(userDAO); - this.apiKeyDAO = apiKeyDAO; - } - @Override public User authenticate(String username, String password) throws AuthenticationException { // Cannot authenticate without an API Key diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/security/authentication/DefaultAuthenticator.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/security/authentication/DefaultAuthenticator.java index 194b2aaa4..395ba0645 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/security/authentication/DefaultAuthenticator.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/security/authentication/DefaultAuthenticator.java @@ -2,9 +2,10 @@ import java.security.NoSuchAlgorithmException; +import javax.annotation.Resource; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.logicaldoc.core.PersistenceException; @@ -25,14 +26,9 @@ public class DefaultAuthenticator extends AbstractAuthenticator { protected static Logger log = LoggerFactory.getLogger(DefaultAuthenticator.class); + @Resource(name = "UserDAO") protected UserDAO userDAO; - @Autowired - public DefaultAuthenticator(UserDAO userDAO) { - super(); - this.userDAO = userDAO; - } - @Override public User authenticate(String username, String password) throws AuthenticationException { return authenticate(username, password, null, null); diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/security/menu/HibernateMenuDAO.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/security/menu/HibernateMenuDAO.java index 472c8c5e3..366d7945e 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/security/menu/HibernateMenuDAO.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/security/menu/HibernateMenuDAO.java @@ -11,6 +11,8 @@ import java.util.StringTokenizer; import java.util.stream.Collectors; +import javax.annotation.Resource; + import org.apache.commons.collections.CollectionUtils; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -56,13 +58,12 @@ public class HibernateMenuDAO extends HibernatePersistentObjectDAO impleme private static final String AND = " and "; - private UserDAO userDAO; + @Resource(name = "UserDAO") + protected UserDAO userDAO; - @Autowired - protected HibernateMenuDAO(UserDAO userDao) { + public HibernateMenuDAO() { super(Menu.class); super.log = LoggerFactory.getLogger(HibernateMenuDAO.class); - this.userDAO = userDao; } @Override diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/security/user/HibernateUserHistoryDAO.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/security/user/HibernateUserHistoryDAO.java index 49e9e6137..ced4de49d 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/security/user/HibernateUserHistoryDAO.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/security/user/HibernateUserHistoryDAO.java @@ -7,20 +7,17 @@ import org.apache.commons.lang.StringUtils; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import com.logicaldoc.core.PersistenceException; import com.logicaldoc.core.history.HibernateHistoryDAO; import com.logicaldoc.core.security.Client; import com.logicaldoc.core.security.Session; import com.logicaldoc.core.security.SessionManager; -import com.logicaldoc.util.config.ContextProperties; public class HibernateUserHistoryDAO extends HibernateHistoryDAO implements UserHistoryDAO { - @Autowired - private HibernateUserHistoryDAO(ContextProperties config) { - super(UserHistory.class, config); + private HibernateUserHistoryDAO() { + super(UserHistory.class); super.log = LoggerFactory.getLogger(HibernateUserHistoryDAO.class); } diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/system/SystemLoadMonitor.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/system/SystemLoadMonitor.java index 68400361c..c6f250860 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/system/SystemLoadMonitor.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/system/SystemLoadMonitor.java @@ -7,12 +7,12 @@ import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; +import javax.annotation.Resource; import javax.management.MBeanServerConnection; import org.apache.commons.collections4.queue.CircularFifoQueue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import com.logicaldoc.util.config.ContextProperties; @@ -29,7 +29,8 @@ public class SystemLoadMonitor { protected static Logger log = LoggerFactory.getLogger(SystemLoadMonitor.class); - private ContextProperties config; + @Resource(name = "ContextProperties") + protected ContextProperties config; private CircularFifoQueue samples = null; @@ -41,12 +42,6 @@ public class SystemLoadMonitor { private boolean lastCheckOverloaded = false; - @Autowired - public SystemLoadMonitor(ContextProperties config) { - super(); - this.config = config; - } - public void addListener(SystemLoadListener listener) { if (!listeners.contains(listener)) listeners.add(listener); diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/task/TaskTrigger.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/task/TaskTrigger.java index 76d7daabb..632e46d32 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/task/TaskTrigger.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/task/TaskTrigger.java @@ -1,5 +1,7 @@ package com.logicaldoc.core.task; +import javax.annotation.Resource; + import org.quartz.CronTrigger; import org.quartz.JobDetail; import org.quartz.SimpleTrigger; @@ -33,16 +35,15 @@ public class TaskTrigger implements FactoryBean, BeanNameAware, Initial public static final String MODE_SIMPLE = "simple"; - private ContextProperties config; + @Resource(name = "ContextProperties") + protected ContextProperties config; private Task task; private JobDetail jobDetail; - @Autowired - private TaskTrigger(ContextProperties config) { + public TaskTrigger() { super(); - this.config = config; } public Task getTask() { diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/threading/ThreadPools.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/threading/ThreadPools.java index 257730764..949821ae9 100644 --- a/logicaldoc-core/src/main/java/com/logicaldoc/core/threading/ThreadPools.java +++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/threading/ThreadPools.java @@ -10,6 +10,7 @@ import java.util.concurrent.TimeUnit; import javax.annotation.PreDestroy; +import javax.annotation.Resource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,13 +50,8 @@ public class ThreadPools { private Map pools = new HashMap<>(); - private ContextProperties config; - - @Autowired - public ThreadPools(ContextProperties config) { - super(); - this.config = config; - } + @Resource(name = "ContextProperties") + protected ContextProperties config; public static ThreadPools get() { return Context.get(ThreadPools.class);