Skip to content

Commit 648895b

Browse files
dependabot[bot]php-coder
authored andcommitted
chore: bump org.apache.commons:commons-lang3 from 3.8 to 3.13.0
Bumps org.apache.commons:commons-lang3 from 3.8 to 3.13.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-lang3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Fix #1183
1 parent 9d6cf08 commit 648895b

File tree

6 files changed

+11
-6
lines changed

6 files changed

+11
-6
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@
555555
<codenarc.version>0.27.0</codenarc.version>
556556

557557
<!-- Redefine default value from spring-boot-dependencies -->
558-
<commons-lang3.version>3.8</commons-lang3.version>
558+
<commons-lang3.version>3.13.0</commons-lang3.version>
559559

560560
<commons.text.version>1.11.0</commons.text.version>
561561
<compiler.plugin.version>3.8.1</compiler.plugin.version>

src/main/java/ru/mystamps/web/feature/category/CategoryServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public List<Integer> findIdsWhenNameStartsWith(String name) {
102102
// FIXME: escape % and _ chars in name
103103
Validate.isTrue(
104104
!StringUtils.containsAny(name, '%', '_'),
105-
"Name must not contain '%%' or '_' chars"
105+
"Name must not contain '%' or '_' chars"
106106
);
107107

108108
// converting to lowercase to perform a case-insensitive search

src/main/java/ru/mystamps/web/feature/category/SuggestionController.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
import org.springframework.web.bind.annotation.RestController;
2525
import ru.mystamps.web.support.spring.security.CustomUserDetails;
2626

27+
import java.util.Objects;
28+
2729
@RestController
2830
@RequiredArgsConstructor
2931
class SuggestionController {
@@ -32,7 +34,7 @@ class SuggestionController {
3234

3335
@GetMapping(CategoryUrl.SUGGEST_SERIES_CATEGORY)
3436
public String suggestCategoryForUser(@AuthenticationPrincipal CustomUserDetails currentUser) {
35-
return StringUtils.defaultString(
37+
return Objects.toString(
3638
categoryService.suggestCategoryForUser(currentUser.getUserId()),
3739
StringUtils.EMPTY
3840
);

src/main/java/ru/mystamps/web/feature/country/CountryServiceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public List<Integer> findIdsWhenNameStartsWith(String name) {
102102
// FIXME: escape % and _ chars in name
103103
Validate.isTrue(
104104
!StringUtils.containsAny(name, '%', '_'),
105-
"Name must not contain '%%' or '_' chars"
105+
"Name must not contain '%' or '_' chars"
106106
);
107107

108108
// converting to lowercase to perform a case-insensitive search

src/main/java/ru/mystamps/web/feature/country/SuggestionController.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
import org.springframework.web.bind.annotation.RestController;
2525
import ru.mystamps.web.support.spring.security.CustomUserDetails;
2626

27+
import java.util.Objects;
28+
2729
@RestController
2830
@RequiredArgsConstructor
2931
class SuggestionController {
@@ -36,7 +38,7 @@ class SuggestionController {
3638
*/
3739
@GetMapping(CountryUrl.SUGGEST_SERIES_COUNTRY)
3840
public String suggestCountryForUser(@AuthenticationPrincipal CustomUserDetails currentUser) {
39-
return StringUtils.defaultString(
41+
return Objects.toString(
4042
countryService.suggestCountryForUser(currentUser.getUserId()),
4143
StringUtils.EMPTY
4244
);

src/main/java/ru/mystamps/web/feature/site/CspController.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.springframework.web.bind.annotation.RestController;
3030

3131
import javax.servlet.http.HttpServletRequest;
32+
import java.util.Objects;
3233
import java.util.regex.Pattern;
3334

3435
@RestController
@@ -49,7 +50,7 @@ public void handleReport(
4950
@RequestHeader(name = HttpHeaders.USER_AGENT, defaultValue = UNKNOWN) String userAgent) {
5051

5152
if (LOG.isWarnEnabled()) {
52-
String ip = StringUtils.defaultString(request.getRemoteAddr(), UNKNOWN);
53+
String ip = Objects.toString(request.getRemoteAddr(), UNKNOWN);
5354
LOG.warn("CSP report from IP: {}, user agent: {}", ip, userAgent);
5455

5556
// Omit "original-policy" as it's quite long and it's useless most of the time

0 commit comments

Comments
 (0)