Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit f91e40a

Browse files
php-coderphp-coder
committedDec 16, 2018
refactor: move site parser configuration from properties files to database for test and travis profiles.
Addressed to #975 No functional changes.
1 parent 0e7e40b commit f91e40a

File tree

3 files changed

+82
-53
lines changed

3 files changed

+82
-53
lines changed
 

‎src/main/resources/application-test.properties

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -41,33 +41,6 @@ logging.level.liquibase: WARN
4141
logging.level.org.springframework.web.servlet.handler.SimpleUrlHandlerMapping: WARN
4242
logging.level.org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping: WARN
4343

44-
# TODO: remove site parsers configurations, when their configuration will be migrated
45-
# property names are important: camel case isn't supported
46-
app.site-parser[0].name = localhost-by-ip
47-
app.site-parser[0].matched-url = http://127.0.0.1:8080
48-
# locators should use CSS or jQuery-like syntax that is supported by jsoup:
49-
# https://jsoup.org/cookbook/extracting-data/selector-syntax
50-
app.site-parser[0].category-locator = #category_name
51-
app.site-parser[0].country-locator = #country_name
52-
app.site-parser[0].image-url-locator = #series-image-link-1
53-
app.site-parser[0].issue-date-locator = #issue_date
54-
55-
app.site-parser[1].name = localhost-by-name
56-
app.site-parser[1].matched-url = http://localhost:8080
57-
app.site-parser[1].image-url-locator = #series-image-link-1
58-
app.site-parser[1].short-description-locator = .dl-horizontal
59-
app.site-parser[1].seller-locator = #test-seller
60-
app.site-parser[1].price-locator = #test-price
61-
app.site-parser[1].currency-value = RUB
62-
63-
app.site-parser[2].name = mockserver
64-
app.site-parser[2].matched-url = http://127.0.0.1:8888
65-
app.site-parser[2].image-url-locator = #test-image
66-
app.site-parser[2].short-description-locator = #test-description
67-
app.site-parser[2].seller-locator = #test-seller
68-
app.site-parser[2].price-locator = #test-price
69-
app.site-parser[2].currency-value = RUB
70-
7144
# Full list of autoconfiguration classes:
7245
# http://docs.spring.io/spring-boot/docs/1.5.x/reference/html/auto-configuration-classes.html
7346
spring.autoconfigure.exclude: \

‎src/main/resources/application-travis.properties

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -38,32 +38,6 @@ logging.level.org.springframework.web.servlet.mvc.method.annotation.RequestMappi
3838
app.upload.dir: /tmp/uploads
3939
app.preview.dir: /tmp/preview
4040

41-
# property names are important: camel case isn't supported
42-
app.site-parser[0].name = localhost-by-ip
43-
app.site-parser[0].matched-url = http://127.0.0.1:8080
44-
# locators should use CSS or jQuery-like syntax that is supported by jsoup:
45-
# https://jsoup.org/cookbook/extracting-data/selector-syntax
46-
app.site-parser[0].category-locator = #category_name
47-
app.site-parser[0].country-locator = #country_name
48-
app.site-parser[0].image-url-locator = #series-image-link-1
49-
app.site-parser[0].issue-date-locator = #issue_date
50-
51-
app.site-parser[1].name = localhost-by-name
52-
app.site-parser[1].matched-url = http://localhost:8080
53-
app.site-parser[1].image-url-locator = #series-image-link-1
54-
app.site-parser[1].short-description-locator = .dl-horizontal
55-
app.site-parser[1].seller-locator = #test-seller
56-
app.site-parser[1].price-locator = #test-price
57-
app.site-parser[1].currency-value = RUB
58-
59-
app.site-parser[2].name = mockserver
60-
app.site-parser[2].matched-url = http://127.0.0.1:8888
61-
app.site-parser[2].image-url-locator = #test-image
62-
app.site-parser[2].short-description-locator = #test-description
63-
app.site-parser[2].seller-locator = #test-seller
64-
app.site-parser[2].price-locator = #test-price
65-
app.site-parser[2].currency-value = RUB
66-
6741
# Full list of autoconfiguration classes:
6842
# http://docs.spring.io/spring-boot/docs/1.5.x/reference/html/auto-configuration-classes.html
6943
# The difference between test profile is that we don't need H2ConsoleAutoConfiguration

‎src/main/resources/liquibase/version/0.4/2018-12-03--site_parsers.xml

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,88 @@
7676
<column name="value" value="#issue_date" />
7777
</insert>
7878

79+
<insert tableName="site_parsers">
80+
<column name="id" valueNumeric="2" />
81+
<column name="name" value="localhost-by-name" />
82+
</insert>
83+
84+
<insert tableName="site_parser_params">
85+
<column name="parser_id" valueNumeric="2" />
86+
<column name="name" value="matched-url" />
87+
<column name="value" value="http://localhost:8080" />
88+
</insert>
89+
90+
<insert tableName="site_parser_params">
91+
<column name="parser_id" valueNumeric="2" />
92+
<column name="name" value="image-url-locator" />
93+
<column name="value" value="#series-image-link-1" />
94+
</insert>
95+
96+
<insert tableName="site_parser_params">
97+
<column name="parser_id" valueNumeric="2" />
98+
<column name="name" value="short-description-locator" />
99+
<column name="value" value=".dl-horizontal" />
100+
</insert>
101+
102+
<insert tableName="site_parser_params">
103+
<column name="parser_id" valueNumeric="2" />
104+
<column name="name" value="seller-locator" />
105+
<column name="value" value="#test-seller" />
106+
</insert>
107+
108+
<insert tableName="site_parser_params">
109+
<column name="parser_id" valueNumeric="2" />
110+
<column name="name" value="price-locator" />
111+
<column name="value" value="#test-price" />
112+
</insert>
113+
114+
<insert tableName="site_parser_params">
115+
<column name="parser_id" valueNumeric="2" />
116+
<column name="name" value="currency-value" />
117+
<column name="value" value="RUB" />
118+
</insert>
119+
120+
<insert tableName="site_parsers">
121+
<column name="id" valueNumeric="3" />
122+
<column name="name" value="mockserver" />
123+
</insert>
124+
125+
<insert tableName="site_parser_params">
126+
<column name="parser_id" valueNumeric="3" />
127+
<column name="name" value="matched-url" />
128+
<column name="value" value="http://127.0.0.1:8888" />
129+
</insert>
130+
131+
<insert tableName="site_parser_params">
132+
<column name="parser_id" valueNumeric="3" />
133+
<column name="name" value="image-url-locator" />
134+
<column name="value" value="#test-image" />
135+
</insert>
136+
137+
<insert tableName="site_parser_params">
138+
<column name="parser_id" valueNumeric="3" />
139+
<column name="name" value="short-description-locator" />
140+
<column name="value" value="#test-description" />
141+
</insert>
142+
143+
<insert tableName="site_parser_params">
144+
<column name="parser_id" valueNumeric="3" />
145+
<column name="name" value="seller-locator" />
146+
<column name="value" value="#test-seller" />
147+
</insert>
148+
149+
<insert tableName="site_parser_params">
150+
<column name="parser_id" valueNumeric="3" />
151+
<column name="name" value="price-locator" />
152+
<column name="value" value="#test-price" />
153+
</insert>
154+
155+
<insert tableName="site_parser_params">
156+
<column name="parser_id" valueNumeric="3" />
157+
<column name="name" value="currency-value" />
158+
<column name="value" value="RUB" />
159+
</insert>
160+
79161
</changeSet>
80162

81163
</databaseChangeLog>

0 commit comments

Comments
 (0)
Please sign in to comment.