Skip to content

Commit 275e4c5

Browse files
committed
CheckStyle: turn off AvoidInlineConditionals check.
No code changes.
1 parent 07e7244 commit 275e4c5

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

src/main/config/checkstyle.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,9 @@
195195

196196
<!-- Checks for common coding problems -->
197197
<!-- See http://checkstyle.sf.net/config_coding.html -->
198+
<!--
198199
<module name="AvoidInlineConditionals"/>
200+
-->
199201
<module name="EmptyStatement"/>
200202
<module name="EqualsHashCode"/>
201203
<module name="HiddenField">

src/main/java/ru/mystamps/web/dao/impl/JdbcSuspiciousActivityDao.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void add(SuspiciousActivity activity) {
4545
params.put("occurred_at", activity.getOccurredAt());
4646
params.put("page", activity.getPage());
4747
Integer userId = activity.getUser() != null // NOPMD
48-
? activity.getUser().getId() // NOCHECKSTYLE
48+
? activity.getUser().getId()
4949
: null;
5050
params.put("user_id", userId);
5151
params.put("ip", activity.getIp());

src/main/java/ru/mystamps/web/service/MailServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ private String getTextOfActivationMail(UsersActivation activation) {
110110
Url.ACTIVATE_ACCOUNT_PAGE_WITH_KEY.replace("{key}", activation.getActivationKey());
111111

112112
Map<String, String> ctx = new HashMap<>();
113-
ctx.put("site_url", testMode ? Url.SITE : Url.PUBLIC_URL); // NOCHECKSTYLE: AvoidInlineConditionalsCheck
113+
ctx.put("site_url", testMode ? Url.SITE : Url.PUBLIC_URL);
114114
ctx.put("activation_url_with_key", activationUrl);
115115
ctx.put("expire_after_days", String.valueOf(CronService.PURGE_AFTER_DAYS));
116116

0 commit comments

Comments
 (0)