Skip to content

Commit 1257407

Browse files
williamhyunwilliamhyun
committed
Remove Magic Strings
1 parent a4cbc7a commit 1257407

File tree

1 file changed

+22
-24
lines changed

1 file changed

+22
-24
lines changed

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

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,12 @@ public class PolarisPolicyServiceIntegrationTest {
110110
private static final PolicyIdentifier NS1_P3 = new PolicyIdentifier(NS1, "P3");
111111
private static final TableIdentifier NS2_T1 = TableIdentifier.of(NS2, "T1");
112112

113+
private static final String NS1_NAME = RESTUtil.encodeNamespace(NS1);
113114
private static final String INVALID_NAMESPACE = "INVALID_NAMESPACE";
114-
private static final String INVALID_TABLE = "INVALID_TABLE";
115115
private static final String INVALID_POLICY = "INVALID_POLICY";
116+
private static final String INVALID_TABLE = "INVALID_TABLE";
116117
private static final String INVALID_NAMESPACE_MSG =
117-
String.format("Namespace does not exist: %s", INVALID_NAMESPACE);
118+
"Namespace does not exist: " + INVALID_NAMESPACE;
118119

119120
private static URI s3BucketBase;
120121
private static String principalRoleName;
@@ -365,7 +366,6 @@ public void testCreatePolicyWithNonExistingNamespace() {
365366
@Test
366367
public void testAttachPolicyToNonExistingNamespace() {
367368
restCatalog.createNamespace(NS1);
368-
String ns = RESTUtil.encodeNamespace(NS1);
369369
policyApi.createPolicy(
370370
currentCatalogName,
371371
NS1_P1,
@@ -384,7 +384,7 @@ public void testAttachPolicyToNonExistingNamespace() {
384384
policyApi
385385
.request(
386386
"polaris/v1/{cat}/namespaces/{ns}/policies/{policy-name}/mappings",
387-
Map.of("cat", currentCatalogName, "ns", ns, "policy-name", NS1_P1.getName()))
387+
Map.of("cat", currentCatalogName, "ns", NS1_NAME, "policy-name", NS1_P1.getName()))
388388
.put(Entity.json(request))) {
389389
Assertions.assertThat(res.getStatus()).isEqualTo(Response.Status.NOT_FOUND.getStatusCode());
390390
Assertions.assertThat(res.readEntity(String.class)).contains(INVALID_NAMESPACE_MSG);
@@ -395,8 +395,6 @@ public void testAttachPolicyToNonExistingNamespace() {
395395
@Test
396396
public void testAttachPolicyToNonExistingTable() {
397397
restCatalog.createNamespace(NS1);
398-
String ns = RESTUtil.encodeNamespace(NS1);
399-
400398
policyApi.createPolicy(
401399
currentCatalogName,
402400
NS1_P1,
@@ -415,19 +413,19 @@ public void testAttachPolicyToNonExistingTable() {
415413
policyApi
416414
.request(
417415
"polaris/v1/{cat}/namespaces/{ns}/policies/{policy-name}/mappings",
418-
Map.of("cat", currentCatalogName, "ns", ns, "policy-name", NS1_P1.getName()))
416+
Map.of("cat", currentCatalogName, "ns", NS1_NAME, "policy-name", NS1_P1.getName()))
419417
.put(Entity.json(request))) {
420418
Assertions.assertThat(res.getStatus()).isEqualTo(Response.Status.NOT_FOUND.getStatusCode());
421419
Assertions.assertThat(res.readEntity(String.class))
422-
.contains(String.format("Table or view does not exist: %s.%s", ns, INVALID_TABLE));
420+
.contains(
421+
String.format("Table or view does not exist: " + NS1_NAME + "." + INVALID_TABLE));
423422
}
424423
policyApi.dropPolicy(currentCatalogName, NS1_P1);
425424
}
426425

427426
@Test
428427
public void testDetachPolicyFromNonExistingNamespace() {
429428
restCatalog.createNamespace(NS1);
430-
String ns = RESTUtil.encodeNamespace(NS1);
431429
policyApi.createPolicy(
432430
currentCatalogName,
433431
NS1_P1,
@@ -444,7 +442,7 @@ public void testDetachPolicyFromNonExistingNamespace() {
444442
policyApi
445443
.request(
446444
"polaris/v1/{cat}/namespaces/{ns}/policies/{policy-name}/mappings",
447-
Map.of("cat", currentCatalogName, "ns", ns, "policy-name", NS1_P1.getName()))
445+
Map.of("cat", currentCatalogName, "ns", NS1_NAME, "policy-name", NS1_P1.getName()))
448446
.post(Entity.json(request))) {
449447
Assertions.assertThat(res.getStatus()).isEqualTo(Response.Status.NOT_FOUND.getStatusCode());
450448
Assertions.assertThat(res.readEntity(String.class)).contains(INVALID_NAMESPACE_MSG);
@@ -455,7 +453,6 @@ public void testDetachPolicyFromNonExistingNamespace() {
455453
@Test
456454
public void testDetachPolicyFromNonExistingTable() {
457455
restCatalog.createNamespace(NS1);
458-
String ns = RESTUtil.encodeNamespace(NS1);
459456
policyApi.createPolicy(
460457
currentCatalogName,
461458
NS1_P1,
@@ -473,11 +470,12 @@ public void testDetachPolicyFromNonExistingTable() {
473470
policyApi
474471
.request(
475472
"polaris/v1/{cat}/namespaces/{ns}/policies/{policy-name}/mappings",
476-
Map.of("cat", currentCatalogName, "ns", ns, "policy-name", NS1_P1.getName()))
473+
Map.of("cat", currentCatalogName, "ns", NS1_NAME, "policy-name", NS1_P1.getName()))
477474
.post(Entity.json(request))) {
478475
Assertions.assertThat(res.getStatus()).isEqualTo(Response.Status.NOT_FOUND.getStatusCode());
479476
Assertions.assertThat(res.readEntity(String.class))
480-
.contains(String.format("Table or view does not exist: %s.%s", ns, INVALID_TABLE));
477+
.contains(
478+
String.format("Table or view does not exist: " + NS1_NAME + "." + INVALID_TABLE));
481479
}
482480
policyApi.dropPolicy(currentCatalogName, NS1_P1);
483481
}
@@ -515,14 +513,14 @@ public void testDropNonExistingPolicy() {
515513
policyApi
516514
.request(
517515
"polaris/v1/{cat}/namespaces/{ns}/policies/{policy}",
518-
Map.of("cat", currentCatalogName, "ns", "NS1", "policy", INVALID_POLICY))
516+
Map.of("cat", currentCatalogName, "ns", NS1_NAME, "policy", INVALID_POLICY))
519517
.delete()) {
520518
Assertions.assertThat(res.getStatus()).isEqualTo(Response.Status.NOT_FOUND.getStatusCode());
521519
Assertions.assertThat(res.readEntity(String.class))
522520
.contains(
523521
"Policy does not exist: class PolicyIdentifier",
524-
"namespace: NS1",
525-
String.format("name: %s", INVALID_POLICY));
522+
"namespace: " + NS1_NAME,
523+
"name: " + INVALID_POLICY);
526524
}
527525
}
528526

@@ -566,14 +564,14 @@ public void testUpdateNonExistingPolicy() {
566564
policyApi
567565
.request(
568566
"polaris/v1/{cat}/namespaces/{ns}/policies/{policy}",
569-
Map.of("cat", currentCatalogName, "ns", "NS1", "policy", INVALID_POLICY))
567+
Map.of("cat", currentCatalogName, "ns", NS1_NAME, "policy", INVALID_POLICY))
570568
.put(Entity.json(request))) {
571569
Assertions.assertThat(res.getStatus()).isEqualTo(Response.Status.NOT_FOUND.getStatusCode());
572570
Assertions.assertThat(res.readEntity(String.class))
573571
.contains(
574572
"Policy does not exist: class PolicyIdentifier",
575-
"namespace: NS1",
576-
String.format("name: %s", INVALID_POLICY));
573+
"namespace: " + NS1_NAME,
574+
"name: " + INVALID_POLICY);
577575
}
578576
}
579577

@@ -648,11 +646,11 @@ public void testGetApplicablePoliciesOnNonExistingTable() {
648646
.request(
649647
"polaris/v1/{cat}/applicable-policies",
650648
Map.of("cat", currentCatalogName),
651-
Map.of("namespace", RESTUtil.encodeNamespace(NS1), "target-name", "INVALID_TABLE"))
649+
Map.of("namespace", NS1_NAME, "target-name", INVALID_TABLE))
652650
.get()) {
653651
Assertions.assertThat(res.getStatus()).isEqualTo(Response.Status.NOT_FOUND.getStatusCode());
654652
Assertions.assertThat(res.readEntity(String.class))
655-
.contains("Table does not exist: NS1.INVALID_TABLE");
653+
.contains("Table does not exist: " + NS1_NAME + "." + INVALID_TABLE);
656654
}
657655
policyApi.dropPolicy(currentCatalogName, NS1_P1);
658656
}
@@ -664,14 +662,14 @@ public void testLoadNonExistingPolicy() {
664662
policyApi
665663
.request(
666664
"polaris/v1/{cat}/namespaces/{ns}/policies/{policy}",
667-
Map.of("cat", currentCatalogName, "ns", "NS1", "policy", INVALID_POLICY))
665+
Map.of("cat", currentCatalogName, "ns", NS1_NAME, "policy", INVALID_POLICY))
668666
.get()) {
669667
Assertions.assertThat(res.getStatus()).isEqualTo(Response.Status.NOT_FOUND.getStatusCode());
670668
Assertions.assertThat(res.readEntity(String.class))
671669
.contains(
672670
"Policy does not exist: class PolicyIdentifier",
673-
"namespace: NS1",
674-
"name: INVALID_POLICY");
671+
"namespace: " + NS1_NAME,
672+
"name: " + INVALID_POLICY);
675673
}
676674
}
677675

0 commit comments

Comments
 (0)