From dfb37c18b9a157f39dae1503b974ad0592ad1d4d Mon Sep 17 00:00:00 2001 From: Rinjae Date: Tue, 18 Aug 2026 17:48:58 +0900 Subject: [PATCH] =?UTF-8?q?commons-lang3=203.13=20=E2=86=92=203.13.1=20?= =?UTF-8?q?=EC=97=85=EA=B7=B8=EB=A0=88=EC=9D=B4=EB=93=9C=EC=99=80=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=B5=9C=EC=A0=81=ED=99=94=20-=20Strings?= =?UTF-8?q?=20API=EB=A1=9C=20=EB=8C=80=EC=B2=B4=20=EB=B0=8F=20StringUtils?= =?UTF-8?q?=20=EB=B6=88=ED=95=84=EC=9A=94=20=EB=A9=94=EC=84=9C=EB=93=9C=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0=20-=20CellPhoneValidator=20=EC=8B=9C?= =?UTF-8?q?=EC=9E=91=20=EB=B2=88=ED=98=B8=20=EC=B2=B4=ED=81=AC=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/apiservice/service/ApiSpecService.java | 7 ++++--- .../portal/common/validator/CellPhoneValidator.java | 11 +++-------- .../CommonsLangUpgradeCompatibilityTest.java | 9 +++++---- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/eactive/apim/portal/apps/apiservice/service/ApiSpecService.java b/src/main/java/com/eactive/apim/portal/apps/apiservice/service/ApiSpecService.java index 3536942..f96db0a 100644 --- a/src/main/java/com/eactive/apim/portal/apps/apiservice/service/ApiSpecService.java +++ b/src/main/java/com/eactive/apim/portal/apps/apiservice/service/ApiSpecService.java @@ -36,6 +36,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Strings; import org.springframework.stereotype.Service; @Service @@ -155,10 +156,10 @@ public class ApiSpecService { updateReferences(pathItem, apiId); String tmpFullPath = StringUtils.isNotEmpty(basePath) - ? StringUtils.join(basePath, "/", StringUtils.removeStart(path, "/")) + ? StringUtils.join(basePath, "/", Strings.CS.removeStart(path, "/")) : path; - final String fullPath = StringUtils.replacePattern(tmpFullPath, "//+", "/"); + final String fullPath = tmpFullPath.replaceAll("//+", "/"); // HTTP 메소드별로 중복 체크 pathItem.readOperationsMap().forEach((httpMethod, operation) -> { @@ -294,7 +295,7 @@ public class ApiSpecService { return StringUtils.EMPTY; } Server server = api.getServers().get(0); - return StringUtils.removeEnd(server.getUrl(), "/"); + return Strings.CS.removeEnd(server.getUrl(), "/"); } private void mergeComponents(OpenAPI currentAPI, String apiId, String apiName, Map mergedComponents, ObjectMapper objectMapper) { diff --git a/src/main/java/com/eactive/apim/portal/common/validator/CellPhoneValidator.java b/src/main/java/com/eactive/apim/portal/common/validator/CellPhoneValidator.java index 86cc89c..3cbc272 100644 --- a/src/main/java/com/eactive/apim/portal/common/validator/CellPhoneValidator.java +++ b/src/main/java/com/eactive/apim/portal/common/validator/CellPhoneValidator.java @@ -1,6 +1,7 @@ package com.eactive.apim.portal.common.validator; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.Strings; import org.springframework.stereotype.Component; import javax.validation.ConstraintValidator; @@ -39,14 +40,8 @@ public class CellPhoneValidator implements ConstraintValidator assertEquals("", StringUtils.trimToEmpty(null)), () -> assertEquals("api-001", StringUtils.defaultIfBlank(" ", "api-001")), () -> assertEquals("API 이름", StringUtils.defaultIfBlank("API 이름", "api-001")), - () -> assertTrue(StringUtils.equalsAnyIgnoreCase(" Y ".trim(), "true", "y", "1")) + () -> assertTrue(Strings.CI.equalsAny(" Y ".trim(), "true", "y", "1")) ); } @Test @DisplayName("API 경로와 메시지 리소스명 문자열 처리가 유지된다") void keepsPathAndResourceNameBehavior() { - String fullPath = StringUtils.join("/openapi/", "/", StringUtils.removeStart("/users", "/")); - String normalizedPath = StringUtils.replacePattern(fullPath, "//+", "/"); + String fullPath = StringUtils.join("/openapi/", "/", Strings.CS.removeStart("/users", "/")); + String normalizedPath = fullPath.replaceAll("//+", "/"); String resource = "/WEB-INF/messages/messages_ko.properties"; String baseName = StringUtils.substringBeforeLast(resource, ".properties"); assertAll( () -> assertEquals("/openapi/users", normalizedPath), - () -> assertEquals("/openapi", StringUtils.removeEnd("/openapi/", "/")), + () -> assertEquals("/openapi", Strings.CS.removeEnd("/openapi/", "/")), () -> assertEquals("/WEB-INF/messages", StringUtils.substringBeforeLast(baseName, "/")), () -> assertEquals("messages_ko", StringUtils.substringAfterLast(baseName, "/")), () -> assertEquals("messages", StringUtils.substringBeforeLast("messages_ko", "_"))