Skip to content

Commit 68116ed

Browse files
gdesiatogdesiato
committed
refactoring logicaldoc-core with @Resources annotations
1 parent 0517623 commit 68116ed

24 files changed

+161
-200
lines changed

‎logicaldoc-core/src/main/java/com/logicaldoc/core/conversion/FormatConverterManager.java‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@
1010
import java.util.List;
1111
import java.util.Map;
1212

13+
import javax.annotation.Resource;
14+
1315
import org.apache.commons.lang.StringUtils;
1416
import org.java.plugin.registry.Extension;
1517
import org.slf4j.Logger;
1618
import org.slf4j.LoggerFactory;
17-
import org.springframework.beans.factory.annotation.Autowired;
1819
import org.springframework.stereotype.Component;
1920

2021
import com.logicaldoc.core.PersistenceException;
@@ -57,31 +58,24 @@ public class FormatConverterManager {
5758

5859
protected static Logger log = LoggerFactory.getLogger(FormatConverterManager.class);
5960

60-
private Store store;
61-
62-
private TenantDAO tenantDao;
61+
@Resource(name = "Store")
62+
protected Store store;
6363

64-
private DocumentManager documentManager;
64+
@Resource(name = "TenantDAO")
65+
protected TenantDAO tenantDao;
6566

66-
private ContextProperties config;
67+
@Resource(name = "documentManager")
68+
protected DocumentManager documentManager;
6769

70+
@Resource(name = "ContextProperties")
71+
protected ContextProperties config;
6872
// Key is the src_extension-dst_extension, value is a collection of
6973
// converters
7074
private Map<String, List<FormatConverter>> converters = new HashMap<>();
7175

7276
// All the available converters
7377
private Map<String, FormatConverter> availableConverters = new HashMap<>();
7478

75-
@Autowired
76-
public FormatConverterManager(Store store, TenantDAO tenantDao, DocumentManager documentManager,
77-
ContextProperties config) {
78-
super();
79-
this.store = store;
80-
this.tenantDao = tenantDao;
81-
this.documentManager = documentManager;
82-
this.config = config;
83-
}
84-
8579
/**
8680
* Retrieves the content of the Pdf conversion. If the Pdf conversion is not
8781
* available in the store, it is created.

‎logicaldoc-core/src/main/java/com/logicaldoc/core/document/DigestProcessor.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
import java.util.List;
44
import java.util.Locale;
55

6+
import javax.annotation.Resource;
7+
68
import org.slf4j.LoggerFactory;
7-
import org.springframework.beans.factory.annotation.Autowired;
89
import org.springframework.stereotype.Component;
910

1011
import com.logicaldoc.core.PersistenceException;
@@ -23,19 +24,19 @@
2324
public class DigestProcessor extends Task {
2425
public static final String NAME = "DigestProcessor";
2526

26-
private DocumentDAO documentDao;
27+
@Resource(name = "DocumentDAO")
28+
protected DocumentDAO documentDao;
2729

2830
private long processed = 0;
2931

3032
private long errors = 0;
3133

32-
@Autowired
33-
public DigestProcessor(DocumentDAO documentDao) {
34+
public DigestProcessor() {
3435
super(NAME);
3536
log = LoggerFactory.getLogger(DigestProcessor.class);
36-
this.documentDao = documentDao;
3737
}
3838

39+
3940
@Override
4041
public boolean isIndeterminate() {
4142
return false;

‎logicaldoc-core/src/main/java/com/logicaldoc/core/document/DocumentManagerImpl.java‎

Lines changed: 26 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@
2222
import java.util.Set;
2323
import java.util.stream.Collectors;
2424

25+
import javax.annotation.Resource;
26+
2527
import org.apache.commons.io.FileUtils;
2628
import org.apache.commons.lang.StringUtils;
2729
import org.slf4j.Logger;
2830
import org.slf4j.LoggerFactory;
29-
import org.springframework.beans.factory.annotation.Autowired;
3031
import org.springframework.jdbc.core.RowMapper;
3132
import org.springframework.stereotype.Component;
3233

@@ -90,49 +91,41 @@ public class DocumentManagerImpl implements DocumentManager {
9091

9192
protected static Logger log = LoggerFactory.getLogger(DocumentManagerImpl.class);
9293

93-
private DocumentDAO documentDAO;
94-
95-
private DocumentLinkDAO documentLinkDAO;
94+
@Resource(name = "DocumentDAO")
95+
protected DocumentDAO documentDAO;
9696

97-
private DocumentNoteDAO documentNoteDAO;
97+
@Resource(name = "DocumentLinkDAO")
98+
protected DocumentLinkDAO documentLinkDAO;
9899

99-
private FolderDAO folderDAO;
100+
@Resource(name = "DocumentNoteDAO")
101+
protected DocumentNoteDAO documentNoteDAO;
100102

101-
private TemplateDAO templateDAO;
103+
@Resource(name = "FolderDAO")
104+
protected FolderDAO folderDAO;
102105

103-
private DocumentListenerManager listenerManager;
106+
@Resource(name = "TemplateDAO")
107+
protected TemplateDAO templateDAO;
104108

105-
private VersionDAO versionDAO;
109+
@Resource(name = "documentListenerManager")
110+
protected DocumentListenerManager listenerManager;
106111

107-
private UserDAO userDAO;
112+
@Resource(name = "VersionDAO")
113+
protected VersionDAO versionDAO;
108114

109-
private TicketDAO ticketDAO;
115+
@Resource(name = "UserDAO")
116+
protected UserDAO userDAO;
110117

111-
private SearchEngine indexer;
118+
@Resource(name = "TicketDAO")
119+
protected TicketDAO ticketDAO;
112120

113-
private Store store;
121+
@Resource(name = "SearchEngine")
122+
protected SearchEngine indexer;
114123

115-
private ContextProperties config;
124+
@Resource(name = "Store")
125+
protected Store store;
116126

117-
@Autowired
118-
public DocumentManagerImpl(DocumentDAO documentDAO, DocumentLinkDAO documentLinkDAO,
119-
DocumentNoteDAO documentNoteDAO, FolderDAO folderDAO, TemplateDAO templateDAO,
120-
DocumentListenerManager listenerManager, VersionDAO versionDAO, UserDAO userDAO, TicketDAO ticketDAO,
121-
SearchEngine indexer, Store store, ContextProperties config) {
122-
super();
123-
this.documentDAO = documentDAO;
124-
this.documentLinkDAO = documentLinkDAO;
125-
this.documentNoteDAO = documentNoteDAO;
126-
this.folderDAO = folderDAO;
127-
this.templateDAO = templateDAO;
128-
this.listenerManager = listenerManager;
129-
this.versionDAO = versionDAO;
130-
this.userDAO = userDAO;
131-
this.ticketDAO = ticketDAO;
132-
this.indexer = indexer;
133-
this.store = store;
134-
this.config = config;
135-
}
127+
@Resource(name = "ContextProperties")
128+
protected ContextProperties config;
136129

137130
@Override
138131
public void replaceFile(long docId, String fileVersion, InputStream content, DocumentHistory transaction)

‎logicaldoc-core/src/main/java/com/logicaldoc/core/document/HibernateDocumentHistoryDAO.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,9 @@
88

99
import org.apache.commons.lang.StringUtils;
1010
import org.slf4j.LoggerFactory;
11-
import org.springframework.beans.factory.annotation.Autowired;
1211

1312
import com.logicaldoc.core.PersistenceException;
1413
import com.logicaldoc.core.history.HibernateHistoryDAO;
15-
import com.logicaldoc.util.config.ContextProperties;
1614
import com.logicaldoc.util.sql.SqlUtil;
1715

1816
/**
@@ -29,9 +27,8 @@ public class HibernateDocumentHistoryDAO extends HibernateHistoryDAO<DocumentHis
2927

3028
private static final String AND = " and ";
3129

32-
@Autowired
33-
private HibernateDocumentHistoryDAO(ContextProperties config) {
34-
super(DocumentHistory.class, config);
30+
private HibernateDocumentHistoryDAO() {
31+
super(DocumentHistory.class);
3532
super.log = LoggerFactory.getLogger(HibernateDocumentHistoryDAO.class);
3633
}
3734

‎logicaldoc-core/src/main/java/com/logicaldoc/core/document/HibernateVersionDAO.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
import java.util.List;
99
import java.util.Set;
1010

11+
import javax.annotation.Resource;
12+
1113
import org.apache.commons.lang.StringUtils;
1214
import org.slf4j.LoggerFactory;
13-
import org.springframework.beans.factory.annotation.Autowired;
1415

1516
import com.logicaldoc.core.HibernatePersistentObjectDAO;
1617
import com.logicaldoc.core.PersistenceException;
@@ -31,16 +32,15 @@ public class HibernateVersionDAO extends HibernatePersistentObjectDAO<Version> i
3132

3233
private static final String DOC_ID = ".docId=";
3334

34-
private Store store;
35+
@Resource(name = "Store")
36+
protected Store store;
3537

36-
private FolderDAO folderDAO;
38+
@Resource(name = "FolderDAO")
39+
protected FolderDAO folderDAO;
3740

38-
@Autowired
39-
private HibernateVersionDAO(Store store, FolderDAO folderDAO) {
41+
public HibernateVersionDAO() {
4042
super(Version.class);
4143
super.log = LoggerFactory.getLogger(HibernateVersionDAO.class);
42-
this.store = store;
43-
this.folderDAO = folderDAO;
4444
}
4545

4646
@Override

‎logicaldoc-core/src/main/java/com/logicaldoc/core/document/TagsProcessor.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package com.logicaldoc.core.document;
22

3+
import javax.annotation.Resource;
4+
35
import org.slf4j.LoggerFactory;
4-
import org.springframework.beans.factory.annotation.Autowired;
56
import org.springframework.stereotype.Component;
67

78
import com.logicaldoc.core.PersistenceException;
@@ -20,13 +21,13 @@ public class TagsProcessor extends Task {
2021

2122
public static final String NAME = "TagsProcessor";
2223

23-
private final DocumentDAO documentDao;
24+
@Resource(name = "DocumentDAO")
25+
private DocumentDAO documentDao;
26+
2427

25-
@Autowired
26-
public TagsProcessor(DocumentDAO documentDao) {
28+
public TagsProcessor() {
2729
super(NAME);
2830
log = LoggerFactory.getLogger(TagsProcessor.class);
29-
this.documentDao = documentDao;
3031
}
3132

3233
@Override

‎logicaldoc-core/src/main/java/com/logicaldoc/core/folder/HibernateFolderDAO.java‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@
1818
import java.util.StringTokenizer;
1919
import java.util.stream.Collectors;
2020

21+
import javax.annotation.Resource;
22+
2123
import org.apache.commons.lang.StringUtils;
2224
import org.slf4j.LoggerFactory;
23-
import org.springframework.beans.factory.annotation.Autowired;
2425
import org.springframework.jdbc.core.BeanPropertyRowMapper;
2526
import org.springframework.jdbc.core.RowMapper;
2627

@@ -95,23 +96,21 @@ public class HibernateFolderDAO extends HibernatePersistentObjectDAO<Folder> imp
9596

9697
private static final String WHERE_GROUP_GROUPID_IN = " where _group.groupId in (";
9798

98-
private UserDAO userDAO;
99+
@Resource(name = "UserDAO")
100+
protected UserDAO userDAO;
99101

100-
private FolderHistoryDAO historyDAO;
102+
@Resource(name = "FolderHistoryDAO")
103+
protected FolderHistoryDAO historyDAO;
101104

102-
private Store store;
105+
@Resource(name = "Store")
106+
protected Store store;
103107

104-
private FolderListenerManager listenerManager;
108+
@Resource(name = "folderListenerManager")
109+
protected FolderListenerManager listenerManager;
105110

106-
@Autowired
107-
protected HibernateFolderDAO(UserDAO userDAO, FolderHistoryDAO historyDAO, Store store,
108-
FolderListenerManager listenerManager) {
111+
public HibernateFolderDAO() {
109112
super(Folder.class);
110113
super.log = LoggerFactory.getLogger(HibernateFolderDAO.class);
111-
this.userDAO = userDAO;
112-
this.historyDAO = historyDAO;
113-
this.store = store;
114-
this.listenerManager = listenerManager;
115114
}
116115

117116
@Override

‎logicaldoc-core/src/main/java/com/logicaldoc/core/folder/HibernateFolderHistoryDAO.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,9 @@
88

99
import org.apache.commons.lang.StringUtils;
1010
import org.slf4j.LoggerFactory;
11-
import org.springframework.beans.factory.annotation.Autowired;
1211

1312
import com.logicaldoc.core.PersistenceException;
1413
import com.logicaldoc.core.history.HibernateHistoryDAO;
15-
import com.logicaldoc.util.config.ContextProperties;
1614
import com.logicaldoc.util.sql.SqlUtil;
1715

1816
/**
@@ -29,9 +27,8 @@ public class HibernateFolderHistoryDAO extends HibernateHistoryDAO<FolderHistory
2927

3028
private static final String ORDER_BY = "order by ";
3129

32-
@Autowired
33-
private HibernateFolderHistoryDAO(ContextProperties config) {
34-
super(FolderHistory.class, config);
30+
private HibernateFolderHistoryDAO() {
31+
super(FolderHistory.class);
3532
super.log = LoggerFactory.getLogger(HibernateFolderHistoryDAO.class);
3633
}
3734

‎logicaldoc-core/src/main/java/com/logicaldoc/core/folder/PathCalculator.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22

33
import java.util.List;
44

5+
import javax.annotation.Resource;
6+
57
import org.slf4j.LoggerFactory;
6-
import org.springframework.beans.factory.annotation.Autowired;
78
import org.springframework.stereotype.Component;
89

910
import com.logicaldoc.core.PersistenceException;
@@ -21,18 +22,17 @@
2122
public class PathCalculator extends Task {
2223

2324
public static final String NAME = "PathCalculator";
24-
25-
private FolderDAO folderDao;
25+
26+
@Resource(name = "FolderDAO")
27+
protected FolderDAO folderDao;
2628

2729
private long processed = 0;
2830

2931
private long errors = 0;
3032

31-
@Autowired
32-
public PathCalculator(FolderDAO folderDao) {
33+
public PathCalculator() {
3334
super(NAME);
3435
log = LoggerFactory.getLogger(PathCalculator.class);
35-
this.folderDao = folderDao;
3636
}
3737

3838
@Override

‎logicaldoc-core/src/main/java/com/logicaldoc/core/history/HibernateHistoryDAO.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
import java.util.HashMap;
55
import java.util.Map;
66

7+
import javax.annotation.Resource;
8+
79
import org.apache.commons.lang.StringUtils;
810
import org.slf4j.LoggerFactory;
9-
import org.springframework.beans.factory.annotation.Autowired;
1011

1112
import com.logicaldoc.core.HibernatePersistentObjectDAO;
1213
import com.logicaldoc.core.PersistenceException;
@@ -28,16 +29,15 @@
2829
public abstract class HibernateHistoryDAO<T extends History> extends HibernatePersistentObjectDAO<T>
2930
implements PersistentObjectDAO<T> {
3031

31-
private ContextProperties config;
32+
@Resource(name = "ContextProperties")
33+
protected ContextProperties config;
3234

3335
// A cache of tenant names to minimize the DB accesses
3436
private static final Map<Long, String> tenantNames = new HashMap<>();
3537

36-
@Autowired
37-
protected HibernateHistoryDAO(Class<T> historyClass, ContextProperties config) {
38+
protected HibernateHistoryDAO(Class<T> historyClass) {
3839
super(historyClass);
3940
super.log = LoggerFactory.getLogger(HibernateHistoryDAO.class);
40-
this.config = config;
4141
}
4242

4343
@Override

0 commit comments

Comments
 (0)