File tree Expand file tree Collapse file tree 6 files changed +34
-3
lines changed
java/ru/mystamps/web/feature/series/importing Expand file tree Collapse file tree 6 files changed +34
-3
lines changed Original file line number Diff line number Diff line change @@ -59,11 +59,10 @@ public class DownloadingSucceededEventListener
59
59
60
60
@ PostConstruct
61
61
public void init () {
62
- // TODO: get all parser names from database
63
- log .info ("Registered site parsers: {}" , siteParsers );
64
-
65
62
// TODO: remove migration logic after finishing migration
66
63
siteParsers .forEach (this ::migrateParser );
64
+
65
+ log .info ("Registered site parsers: {}" , siteParserService .findParserNames ());
67
66
}
68
67
69
68
@ Override
Original file line number Diff line number Diff line change 19
19
20
20
import java .util .Collections ;
21
21
import java .util .HashMap ;
22
+ import java .util .List ;
22
23
import java .util .Map ;
23
24
24
25
import org .apache .commons .lang3 .Validate ;
@@ -50,6 +51,9 @@ public class JdbcSiteParserDao implements SiteParserDao {
50
51
@ Value ("${site_parser.find_like_matched_url}" )
51
52
private String findParserIdByMatchedUrl ;
52
53
54
+ @ Value ("${site_parser.find_names}" )
55
+ private String findParserNamesSql ;
56
+
53
57
@ SuppressWarnings ("PMD.LongVariable" )
54
58
@ Value ("${site_parser_param.find_all_with_parser_name}" )
55
59
private String findParametersWithParserNameSql ;
@@ -102,6 +106,15 @@ public Integer findParserIdForUrl(String url) {
102
106
}
103
107
}
104
108
109
+ @ Override
110
+ public List <String > findParserNames () {
111
+ return jdbcTemplate .queryForList (
112
+ findParserNamesSql ,
113
+ Collections .emptyMap (),
114
+ String .class
115
+ );
116
+ }
117
+
105
118
@ Override
106
119
public SiteParserConfiguration findConfigurationForParser (Integer parserId ) {
107
120
Map <String , String > params = jdbcTemplate .query (
Original file line number Diff line number Diff line change 17
17
*/
18
18
package ru .mystamps .web .feature .series .importing .extractor ;
19
19
20
+ import java .util .List ;
21
+
20
22
public interface SiteParserDao {
21
23
Integer addParser (String name );
22
24
void addParserParameter (AddParserParameterDbDto param );
23
25
Integer findParserIdForUrl (String url );
26
+ List <String > findParserNames ();
24
27
SiteParserConfiguration findConfigurationForParser (Integer parserId );
25
28
}
Original file line number Diff line number Diff line change 17
17
*/
18
18
package ru .mystamps .web .feature .series .importing .extractor ;
19
19
20
+ import java .util .List ;
21
+
20
22
public interface SiteParserService {
21
23
void add (SiteParserConfiguration cfg );
22
24
SiteParser findForUrl (String url );
25
+ List <String > findParserNames ();
23
26
}
Original file line number Diff line number Diff line change 17
17
*/
18
18
package ru .mystamps .web .feature .series .importing .extractor ;
19
19
20
+ import java .util .List ;
20
21
import java .util .Map ;
21
22
22
23
import org .apache .commons .lang3 .Validate ;
@@ -80,4 +81,11 @@ public SiteParser findForUrl(String url) {
80
81
return new JsoupSiteParser (cfg );
81
82
}
82
83
84
+ // @todo #975 SiteParserServiceImpl.findParserNames(): add unit tests
85
+ @ Override
86
+ @ Transactional (readOnly = true )
87
+ public List <String > findParserNames () {
88
+ return siteParserDao .findParserNames ();
89
+ }
90
+
83
91
}
Original file line number Diff line number Diff line change @@ -23,6 +23,11 @@ SELECT parser_id AS id \
23
23
AND value = :url \
24
24
OR :url LIKE CONCAT(value, ' %' )
25
25
26
+ site_parser.find_names = \
27
+ SELECT name \
28
+ FROM site_parsers \
29
+ ORDER BY id
30
+
26
31
site_parser_param.find_all_with_parser_name = \
27
32
SELECT name \
28
33
, value \
You can’t perform that action at this time.
0 commit comments