Using the locationWithoutScheme for use in withoutScheme method and another minor change

Author: pavibhai

polaris-core/src/main/java/org/apache/polaris/core/storage/aws/S3Location.java

@@ -25,9 +25,9 @@
 import org.apache.polaris.core.storage.StorageLocation;
 
 public class S3Location extends StorageLocation {
-  private static final Pattern URI_PATTERN = Pattern.compile("^(s3a?)://(.+)$");
+  private static final Pattern URI_PATTERN = Pattern.compile("^(s3a?):(.+)$");
   private final String scheme;
-  private final String objectKeyWBucket;
+  private final String locationWithoutScheme;
 
   public S3Location(@Nonnull String location) {
     super(location);
@@ -36,7 +36,7 @@ public S3Location(@Nonnull String location) {
       throw new IllegalArgumentException("Invalid S3 location uri " + location);
     }
     this.scheme = matcher.group(1);
-    this.objectKeyWBucket = matcher.group(2);
+    this.locationWithoutScheme = matcher.group(2);
   }
 
   public static boolean isS3Location(String location) {
@@ -52,8 +52,8 @@ public boolean isChildOf(StorageLocation potentialParent) {
     if (potentialParent instanceof S3Location) {
       S3Location that = (S3Location) potentialParent;
       // Given that S3 and S3A are to be treated similarly, the parent check ignores the prefix
-      String slashTerminatedObjectKey = ensureTrailingSlash(this.objectKeyWBucket);
-      String slashTerminatedObjectKeyThat = ensureTrailingSlash(that.objectKeyWBucket);
+      String slashTerminatedObjectKey = ensureTrailingSlash(this.locationWithoutScheme);
+      String slashTerminatedObjectKeyThat = ensureTrailingSlash(that.locationWithoutScheme);
       return slashTerminatedObjectKey.startsWith(slashTerminatedObjectKeyThat);
     }
     return false;
@@ -63,7 +63,8 @@ public String getScheme() {
     return scheme;
   }
 
-  public String getObjectKeyWBucket() {
-    return objectKeyWBucket;
+  @Override
+  public String withoutScheme() {
+    return locationWithoutScheme;
   }
 }

polaris-core/src/test/java/org/apache/polaris/core/storage/aws/S3LocationTest.java

@@ -34,7 +34,7 @@ public void testLocation(String scheme) {
     Assertions.assertThat(loc).isInstanceOf(S3Location.class);
     S3Location s3Loc = (S3Location) loc;
     Assertions.assertThat(s3Loc.getScheme()).isEqualTo(scheme);
-    Assertions.assertThat(s3Loc.getObjectKeyWBucket()).isEqualTo("bucket/schema1/table1");
+    Assertions.assertThat(s3Loc.withoutScheme()).isEqualTo("//bucket/schema1/table1");
     Assertions.assertThat(s3Loc.withoutScheme()).doesNotStartWith(scheme);
     Assertions.assertThat(scheme + ":" + s3Loc.withoutScheme()).isEqualTo(locInput);
   }

runtime/service/src/test/java/org/apache/polaris/service/quarkus/entity/CatalogEntityTest.java

@@ -68,12 +68,12 @@ public void testInvalidAllowedLocationPrefixS3(String scheme) {
             .setStorageType(StorageConfigInfo.StorageTypeEnum.S3)
             .setAllowedLocations(List.of(storageLocation, scheme + "://externally-owned-bucket"))
             .build();
-    CatalogProperties prop = new CatalogProperties(storageLocation);
+    CatalogProperties props = new CatalogProperties(storageLocation);
     Catalog awsCatalog =
         PolarisCatalog.builder()
             .setType(Catalog.TypeEnum.INTERNAL)
             .setName("name")
-            .setProperties(prop)
+            .setProperties(props)
             .setStorageConfigInfo(awsStorageConfigModel)
             .build();
     Assertions.assertThatThrownBy(() -> CatalogEntity.fromCatalog(callContext, awsCatalog))