Skip to content

Commit 09ae554

Browse files
committed
Fixed a couple warnings/errors from CheckStyle.
Should be in 7434210 commit. No functional changes.
1 parent 7ab6168 commit 09ae554

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

src/main/java/ru/mystamps/web/dao/SeriesDao.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,10 @@ public interface SeriesDao extends CrudRepository<Series, Integer> {
5959
+ "LEFT JOIN s.country c "
6060
+ "WHERE s.category = :category"
6161
)
62-
Iterable<SeriesInfoDto> findByAsSeriesInfo(@Param("category") Category category, @Param("lang") String lang);
62+
Iterable<SeriesInfoDto> findByAsSeriesInfo(
63+
@Param("category") Category category,
64+
@Param("lang") String lang
65+
);
6366

6467
@Query(
6568
"SELECT NEW ru.mystamps.web.service.dto.SeriesInfoDto("
@@ -77,5 +80,8 @@ public interface SeriesDao extends CrudRepository<Series, Integer> {
7780
+ "LEFT JOIN s.country c "
7881
+ "WHERE s.country = :country"
7982
)
80-
Iterable<SeriesInfoDto> findByAsSeriesInfo(@Param("country") Country country, @Param("lang") String lang);
83+
Iterable<SeriesInfoDto> findByAsSeriesInfo(
84+
@Param("country") Country country,
85+
@Param("lang") String lang
86+
);
8187
}

src/main/java/ru/mystamps/web/util/LocaleUtils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public final class LocaleUtils {
2828
private LocaleUtils() {
2929
}
3030

31+
@SuppressWarnings("checkstyle:avoidinlineconditionals")
3132
public static String getLanguageOrNull(Locale locale) {
3233
return locale != null ? locale.getLanguage() : null;
3334
}

src/test/java/ru/mystamps/web/service/TestObjects.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
import ru.mystamps.web.service.dto.DbImageDto;
3030

3131
final class TestObjects {
32-
32+
public static final String TEST_COUNTRY_EN_NAME = "Somewhere";
33+
public static final String TEST_COUNTRY_RU_NAME = "Где-то";
34+
3335
protected static final String TEST_PASSWORD = "secret";
3436

3537
private static final Integer TEST_COUNTRY_ID = 1;
36-
public static final String TEST_COUNTRY_EN_NAME = "Somewhere";
37-
public static final String TEST_COUNTRY_RU_NAME = "Где-то";
3838

3939
private static final String TEST_EMAIL = "[email protected]";
4040
private static final String TEST_ACTIVATION_KEY = "1234567890";

0 commit comments

Comments
 (0)