Skip to content

Commit c149316

Browse files
authored
Fix deprecation warnings around RandomStringUtils (#2507)
the `RandomStringUtils.random` method is deprecated since commons-lang 3.17.0 apache/commons-lang@69cb996
1 parent ee7f370 commit c149316

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisManagementServiceIntegrationTest.java

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,10 @@ public void tearDown() {
136136
client.cleanUp(authToken);
137137
}
138138

139+
private static String newRandomString(int length) {
140+
return RandomStringUtils.insecure().next(length, true, true);
141+
}
142+
139143
@Test
140144
public void testCatalogSerializing() throws IOException {
141145
CatalogProperties props = new CatalogProperties("s3://my-old-bucket/path/to/data");
@@ -215,7 +219,7 @@ public void testCreateCatalogWithInvalidName() {
215219
.setAllowedLocations(List.of("s3://my-old-bucket/path/to/data"))
216220
.build();
217221

218-
String goodName = RandomStringUtils.random(MAX_IDENTIFIER_LENGTH, true, true);
222+
String goodName = newRandomString(MAX_IDENTIFIER_LENGTH);
219223

220224
Catalog catalog =
221225
PolarisCatalog.builder()
@@ -228,7 +232,7 @@ public void testCreateCatalogWithInvalidName() {
228232
assertThat(response).returns(Response.Status.CREATED.getStatusCode(), Response::getStatus);
229233
}
230234

231-
String longInvalidName = RandomStringUtils.random(MAX_IDENTIFIER_LENGTH + 1, true, true);
235+
String longInvalidName = newRandomString(MAX_IDENTIFIER_LENGTH + 1);
232236
List<String> invalidCatalogNames =
233237
Arrays.asList(
234238
longInvalidName,
@@ -751,7 +755,7 @@ public void testGetCatalogNotFound() {
751755

752756
@Test
753757
public void testGetCatalogInvalidName() {
754-
String longInvalidName = RandomStringUtils.random(MAX_IDENTIFIER_LENGTH + 1, true, true);
758+
String longInvalidName = newRandomString(MAX_IDENTIFIER_LENGTH + 1);
755759
List<String> invalidCatalogNames =
756760
Arrays.asList(
757761
longInvalidName,
@@ -784,7 +788,7 @@ public void testCatalogRoleInvalidName() {
784788
.build();
785789
managementApi.createCatalog(catalog);
786790

787-
String longInvalidName = RandomStringUtils.random(MAX_IDENTIFIER_LENGTH + 1, true, true);
791+
String longInvalidName = newRandomString(MAX_IDENTIFIER_LENGTH + 1);
788792
List<String> invalidCatalogRoleNames =
789793
Arrays.asList(
790794
longInvalidName,
@@ -1038,15 +1042,15 @@ public void testCreateListUpdateAndDeletePrincipal() {
10381042

10391043
@Test
10401044
public void testCreatePrincipalWithInvalidName() {
1041-
String goodName = RandomStringUtils.random(MAX_IDENTIFIER_LENGTH, true, true);
1045+
String goodName = newRandomString(MAX_IDENTIFIER_LENGTH);
10421046
Principal principal =
10431047
Principal.builder()
10441048
.setName(goodName)
10451049
.setProperties(Map.of("custom-tag", "good_principal"))
10461050
.build();
10471051
managementApi.createPrincipal(new CreatePrincipalRequest(principal, null));
10481052

1049-
String longInvalidName = RandomStringUtils.random(MAX_IDENTIFIER_LENGTH + 1, true, true);
1053+
String longInvalidName = newRandomString(MAX_IDENTIFIER_LENGTH + 1);
10501054
List<String> invalidPrincipalNames =
10511055
Arrays.asList(
10521056
longInvalidName,
@@ -1078,7 +1082,7 @@ public void testCreatePrincipalWithInvalidName() {
10781082

10791083
@Test
10801084
public void testGetPrincipalWithInvalidName() {
1081-
String longInvalidName = RandomStringUtils.random(MAX_IDENTIFIER_LENGTH + 1, true, true);
1085+
String longInvalidName = newRandomString(MAX_IDENTIFIER_LENGTH + 1);
10821086
List<String> invalidPrincipalNames =
10831087
Arrays.asList(
10841088
longInvalidName,
@@ -1193,12 +1197,12 @@ public void testCreateListUpdateAndDeletePrincipalRole() {
11931197

11941198
@Test
11951199
public void testCreatePrincipalRoleInvalidName() {
1196-
String goodName = RandomStringUtils.random(MAX_IDENTIFIER_LENGTH, true, true);
1200+
String goodName = newRandomString(MAX_IDENTIFIER_LENGTH);
11971201
PrincipalRole principalRole =
11981202
new PrincipalRole(goodName, false, Map.of("custom-tag", "good_principal_role"), 0L, 0L, 1);
11991203
managementApi.createPrincipalRole(principalRole);
12001204

1201-
String longInvalidName = RandomStringUtils.random(MAX_IDENTIFIER_LENGTH + 1, true, true);
1205+
String longInvalidName = newRandomString(MAX_IDENTIFIER_LENGTH + 1);
12021206
List<String> invalidPrincipalRoleNames =
12031207
Arrays.asList(
12041208
longInvalidName,
@@ -1233,7 +1237,7 @@ public void testCreatePrincipalRoleInvalidName() {
12331237

12341238
@Test
12351239
public void testGetPrincipalRoleInvalidName() {
1236-
String longInvalidName = RandomStringUtils.random(MAX_IDENTIFIER_LENGTH + 1, true, true);
1240+
String longInvalidName = newRandomString(MAX_IDENTIFIER_LENGTH + 1);
12371241
List<String> invalidPrincipalRoleNames =
12381242
Arrays.asList(
12391243
longInvalidName,

0 commit comments

Comments
 (0)