From b95bc846b214a58bda917b4f53a1e1f34a045223 Mon Sep 17 00:00:00 2001 From: CaptainB Date: Mon, 19 Feb 2024 17:05:10 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BD=BF=E7=94=A8apache=E6=8F=90?= =?UTF-8?q?=E4=BE=9B=E7=9A=84stringutils?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/ApiDebugModuleControllerTests.java | 2 +- .../api/controller/ApiDefinitionModuleControllerTests.java | 2 +- .../io/metersphere/api/controller/ApiReportSendNoticeTests.java | 2 +- .../metersphere/api/controller/ApiScenarioControllerTests.java | 2 +- .../api/controller/ApiScenarioModuleControllerTests.java | 2 +- .../metersphere/api/controller/ApiTestCaseControllerTests.java | 2 +- .../io/metersphere/api/service/BaseResourcePoolTestService.java | 2 +- .../functional/controller/CaseReviewControllerTests.java | 2 +- .../functional/controller/CaseReviewModuleControllerTests.java | 2 +- .../controller/FunctionalCaseAttachmentControllerTests.java | 2 +- .../functional/controller/FunctionalCaseControllerTests.java | 2 +- .../controller/FunctionalCaseDemandControllerTests.java | 2 +- .../controller/FunctionalCaseModuleControllerTests.java | 2 +- .../java/io/metersphere/functional/utils/FileBaseUtils.java | 2 +- .../filemanagement/FileManagementControllerTests.java | 2 +- .../controller/filemanagement/FileRepositoryControllerTest.java | 2 +- .../io/metersphere/project/utils/FileManagementBaseUtils.java | 2 +- .../metersphere/system/base/param/NotBlankParamGenerator.java | 2 +- .../java/io/metersphere/system/base/param/ParamGenerator.java | 2 +- .../system/controller/GlobalUserRoleControllerTests.java | 2 +- .../java/io/metersphere/plan/service/TestPlanTestService.java | 2 +- .../test/java/io/metersphere/plan/utils/TestPlanTestUtils.java | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiDebugModuleControllerTests.java b/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiDebugModuleControllerTests.java index d32e96a4ca..4b92d28f8c 100644 --- a/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiDebugModuleControllerTests.java +++ b/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiDebugModuleControllerTests.java @@ -30,7 +30,7 @@ import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.ResultMatcher; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; -import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.nio.charset.StandardCharsets; import java.util.ArrayList; diff --git a/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiDefinitionModuleControllerTests.java b/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiDefinitionModuleControllerTests.java index 31496daa91..42d96419be 100644 --- a/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiDefinitionModuleControllerTests.java +++ b/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiDefinitionModuleControllerTests.java @@ -37,7 +37,7 @@ import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMock import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.ResultMatcher; -import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.nio.charset.StandardCharsets; import java.util.ArrayList; diff --git a/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiReportSendNoticeTests.java b/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiReportSendNoticeTests.java index 2443f60452..0b1730b4eb 100644 --- a/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiReportSendNoticeTests.java +++ b/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiReportSendNoticeTests.java @@ -21,7 +21,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; -import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; import java.util.List; diff --git a/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiScenarioControllerTests.java b/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiScenarioControllerTests.java index 0c14ea332c..32aeacd376 100644 --- a/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiScenarioControllerTests.java +++ b/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiScenarioControllerTests.java @@ -67,7 +67,7 @@ import org.springframework.http.MediaType; import org.springframework.mock.web.MockMultipartFile; import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.ResultMatcher; -import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.io.File; import java.io.FileInputStream; diff --git a/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiScenarioModuleControllerTests.java b/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiScenarioModuleControllerTests.java index 10dc965749..b89da8d744 100644 --- a/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiScenarioModuleControllerTests.java +++ b/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiScenarioModuleControllerTests.java @@ -32,7 +32,7 @@ import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMock import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.ResultMatcher; -import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.nio.charset.StandardCharsets; import java.util.ArrayList; diff --git a/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiTestCaseControllerTests.java b/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiTestCaseControllerTests.java index 3e0938a650..5be9ba251c 100644 --- a/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiTestCaseControllerTests.java +++ b/backend/services/api-test/src/test/java/io/metersphere/api/controller/ApiTestCaseControllerTests.java @@ -52,7 +52,7 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.ResultMatcher; import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; -import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.nio.charset.StandardCharsets; import java.util.ArrayList; diff --git a/backend/services/api-test/src/test/java/io/metersphere/api/service/BaseResourcePoolTestService.java b/backend/services/api-test/src/test/java/io/metersphere/api/service/BaseResourcePoolTestService.java index 9399a20677..16ef912676 100644 --- a/backend/services/api-test/src/test/java/io/metersphere/api/service/BaseResourcePoolTestService.java +++ b/backend/services/api-test/src/test/java/io/metersphere/api/service/BaseResourcePoolTestService.java @@ -24,7 +24,7 @@ import jakarta.annotation.Resource; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.List; diff --git a/backend/services/case-management/src/test/java/io/metersphere/functional/controller/CaseReviewControllerTests.java b/backend/services/case-management/src/test/java/io/metersphere/functional/controller/CaseReviewControllerTests.java index cfe4bbb6bc..09b2d4f3d5 100644 --- a/backend/services/case-management/src/test/java/io/metersphere/functional/controller/CaseReviewControllerTests.java +++ b/backend/services/case-management/src/test/java/io/metersphere/functional/controller/CaseReviewControllerTests.java @@ -27,7 +27,7 @@ import org.springframework.test.context.jdbc.SqlConfig; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; -import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.math.BigDecimal; import java.nio.charset.StandardCharsets; diff --git a/backend/services/case-management/src/test/java/io/metersphere/functional/controller/CaseReviewModuleControllerTests.java b/backend/services/case-management/src/test/java/io/metersphere/functional/controller/CaseReviewModuleControllerTests.java index 8d94a4570d..77bfc536f6 100644 --- a/backend/services/case-management/src/test/java/io/metersphere/functional/controller/CaseReviewModuleControllerTests.java +++ b/backend/services/case-management/src/test/java/io/metersphere/functional/controller/CaseReviewModuleControllerTests.java @@ -29,7 +29,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; -import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.nio.charset.StandardCharsets; import java.util.ArrayList; diff --git a/backend/services/case-management/src/test/java/io/metersphere/functional/controller/FunctionalCaseAttachmentControllerTests.java b/backend/services/case-management/src/test/java/io/metersphere/functional/controller/FunctionalCaseAttachmentControllerTests.java index 2153f513e4..24bf29496e 100644 --- a/backend/services/case-management/src/test/java/io/metersphere/functional/controller/FunctionalCaseAttachmentControllerTests.java +++ b/backend/services/case-management/src/test/java/io/metersphere/functional/controller/FunctionalCaseAttachmentControllerTests.java @@ -34,7 +34,7 @@ import org.springframework.test.context.jdbc.SqlConfig; import org.springframework.test.web.servlet.MvcResult; import org.springframework.util.LinkedMultiValueMap; import org.springframework.web.multipart.MultipartFile; -import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.nio.charset.StandardCharsets; import java.util.*; diff --git a/backend/services/case-management/src/test/java/io/metersphere/functional/controller/FunctionalCaseControllerTests.java b/backend/services/case-management/src/test/java/io/metersphere/functional/controller/FunctionalCaseControllerTests.java index 27eff310c7..348b6179ce 100644 --- a/backend/services/case-management/src/test/java/io/metersphere/functional/controller/FunctionalCaseControllerTests.java +++ b/backend/services/case-management/src/test/java/io/metersphere/functional/controller/FunctionalCaseControllerTests.java @@ -47,7 +47,7 @@ import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import org.springframework.util.LinkedMultiValueMap; import org.springframework.web.multipart.MultipartFile; -import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.nio.charset.StandardCharsets; import java.util.*; diff --git a/backend/services/case-management/src/test/java/io/metersphere/functional/controller/FunctionalCaseDemandControllerTests.java b/backend/services/case-management/src/test/java/io/metersphere/functional/controller/FunctionalCaseDemandControllerTests.java index 8009696d53..4ee161c0d6 100644 --- a/backend/services/case-management/src/test/java/io/metersphere/functional/controller/FunctionalCaseDemandControllerTests.java +++ b/backend/services/case-management/src/test/java/io/metersphere/functional/controller/FunctionalCaseDemandControllerTests.java @@ -37,7 +37,7 @@ import org.springframework.test.context.jdbc.Sql; import org.springframework.test.context.jdbc.SqlConfig; import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; -import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.nio.charset.StandardCharsets; import java.util.ArrayList; diff --git a/backend/services/case-management/src/test/java/io/metersphere/functional/controller/FunctionalCaseModuleControllerTests.java b/backend/services/case-management/src/test/java/io/metersphere/functional/controller/FunctionalCaseModuleControllerTests.java index 9cebfa6732..c2e97f02f1 100644 --- a/backend/services/case-management/src/test/java/io/metersphere/functional/controller/FunctionalCaseModuleControllerTests.java +++ b/backend/services/case-management/src/test/java/io/metersphere/functional/controller/FunctionalCaseModuleControllerTests.java @@ -29,7 +29,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; -import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.nio.charset.StandardCharsets; import java.util.ArrayList; diff --git a/backend/services/case-management/src/test/java/io/metersphere/functional/utils/FileBaseUtils.java b/backend/services/case-management/src/test/java/io/metersphere/functional/utils/FileBaseUtils.java index 78dff553c1..a416fcbd33 100644 --- a/backend/services/case-management/src/test/java/io/metersphere/functional/utils/FileBaseUtils.java +++ b/backend/services/case-management/src/test/java/io/metersphere/functional/utils/FileBaseUtils.java @@ -7,7 +7,7 @@ import io.metersphere.system.dto.sdk.BaseTreeNode; import io.metersphere.system.utils.Pager; import org.apache.commons.collections4.CollectionUtils; import org.junit.jupiter.api.Assertions; -import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.io.File; import java.io.FileInputStream; diff --git a/backend/services/project-management/src/test/java/io/metersphere/project/controller/filemanagement/FileManagementControllerTests.java b/backend/services/project-management/src/test/java/io/metersphere/project/controller/filemanagement/FileManagementControllerTests.java index 082b3c2b7f..cdf98b776c 100644 --- a/backend/services/project-management/src/test/java/io/metersphere/project/controller/filemanagement/FileManagementControllerTests.java +++ b/backend/services/project-management/src/test/java/io/metersphere/project/controller/filemanagement/FileManagementControllerTests.java @@ -50,7 +50,7 @@ import org.springframework.test.web.servlet.ResultActions; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.io.File; import java.nio.charset.StandardCharsets; diff --git a/backend/services/project-management/src/test/java/io/metersphere/project/controller/filemanagement/FileRepositoryControllerTest.java b/backend/services/project-management/src/test/java/io/metersphere/project/controller/filemanagement/FileRepositoryControllerTest.java index 1503a007a0..524c12a88d 100644 --- a/backend/services/project-management/src/test/java/io/metersphere/project/controller/filemanagement/FileRepositoryControllerTest.java +++ b/backend/services/project-management/src/test/java/io/metersphere/project/controller/filemanagement/FileRepositoryControllerTest.java @@ -32,7 +32,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.ResultActions; -import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.nio.charset.StandardCharsets; import java.util.ArrayList; diff --git a/backend/services/project-management/src/test/java/io/metersphere/project/utils/FileManagementBaseUtils.java b/backend/services/project-management/src/test/java/io/metersphere/project/utils/FileManagementBaseUtils.java index 84da7b4b02..de6925946e 100644 --- a/backend/services/project-management/src/test/java/io/metersphere/project/utils/FileManagementBaseUtils.java +++ b/backend/services/project-management/src/test/java/io/metersphere/project/utils/FileManagementBaseUtils.java @@ -7,7 +7,7 @@ import io.metersphere.system.dto.sdk.BaseTreeNode; import io.metersphere.system.utils.Pager; import org.apache.commons.collections4.CollectionUtils; import org.junit.jupiter.api.Assertions; -import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.io.File; import java.io.FileInputStream; diff --git a/backend/services/system-setting/src/test/java/io/metersphere/system/base/param/NotBlankParamGenerator.java b/backend/services/system-setting/src/test/java/io/metersphere/system/base/param/NotBlankParamGenerator.java index 70a2644de0..bfb0f5d9ef 100644 --- a/backend/services/system-setting/src/test/java/io/metersphere/system/base/param/NotBlankParamGenerator.java +++ b/backend/services/system-setting/src/test/java/io/metersphere/system/base/param/NotBlankParamGenerator.java @@ -1,6 +1,6 @@ package io.metersphere.system.base.param; -import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.lang.annotation.Annotation; import java.lang.reflect.Field; diff --git a/backend/services/system-setting/src/test/java/io/metersphere/system/base/param/ParamGenerator.java b/backend/services/system-setting/src/test/java/io/metersphere/system/base/param/ParamGenerator.java index 49b7b5b52c..d0a336cdbe 100644 --- a/backend/services/system-setting/src/test/java/io/metersphere/system/base/param/ParamGenerator.java +++ b/backend/services/system-setting/src/test/java/io/metersphere/system/base/param/ParamGenerator.java @@ -1,6 +1,6 @@ package io.metersphere.system.base.param; -import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.lang.annotation.Annotation; import java.lang.reflect.Field; diff --git a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/GlobalUserRoleControllerTests.java b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/GlobalUserRoleControllerTests.java index 4d2aa431dc..3cf0d949f0 100644 --- a/backend/services/system-setting/src/test/java/io/metersphere/system/controller/GlobalUserRoleControllerTests.java +++ b/backend/services/system-setting/src/test/java/io/metersphere/system/controller/GlobalUserRoleControllerTests.java @@ -27,7 +27,7 @@ import org.junit.jupiter.api.*; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.web.servlet.MvcResult; -import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.*; import java.util.stream.Collectors; diff --git a/backend/services/test-plan/src/test/java/io/metersphere/plan/service/TestPlanTestService.java b/backend/services/test-plan/src/test/java/io/metersphere/plan/service/TestPlanTestService.java index 973bfd4101..1105cc7c5c 100644 --- a/backend/services/test-plan/src/test/java/io/metersphere/plan/service/TestPlanTestService.java +++ b/backend/services/test-plan/src/test/java/io/metersphere/plan/service/TestPlanTestService.java @@ -21,7 +21,7 @@ import jakarta.annotation.Resource; import org.apache.commons.collections.CollectionUtils; import org.junit.jupiter.api.Assertions; import org.springframework.stereotype.Service; -import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; import java.util.List; diff --git a/backend/services/test-plan/src/test/java/io/metersphere/plan/utils/TestPlanTestUtils.java b/backend/services/test-plan/src/test/java/io/metersphere/plan/utils/TestPlanTestUtils.java index 57a38f0bb4..ba900a01c4 100644 --- a/backend/services/test-plan/src/test/java/io/metersphere/plan/utils/TestPlanTestUtils.java +++ b/backend/services/test-plan/src/test/java/io/metersphere/plan/utils/TestPlanTestUtils.java @@ -2,7 +2,7 @@ package io.metersphere.plan.utils; import io.metersphere.system.dto.sdk.BaseTreeNode; import org.apache.commons.collections4.CollectionUtils; -import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.List;