diff --git a/polaris-service/src/main/java/org/apache/polaris/service/catalog/BasePolarisCatalog.java b/polaris-service/src/main/java/org/apache/polaris/service/catalog/BasePolarisCatalog.java index 8a413c462..8c6fd5808 100644 --- a/polaris-service/src/main/java/org/apache/polaris/service/catalog/BasePolarisCatalog.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/catalog/BasePolarisCatalog.java @@ -1304,10 +1304,7 @@ public void doCommit(TableMetadata base, TableMetadata metadata) { dataLocations.forEach( location -> validateNoLocationOverlap( - catalogEntity, - tableIdentifier, - resolvedNamespace, - location)); + catalogEntity, tableIdentifier, resolvedNamespace, location)); // and that the metadata file points to a location within the table's directory structure if (metadata.metadataFileLocation() != null) { validateMetadataFileInTableDir(tableIdentifier, metadata, catalog); @@ -1521,10 +1518,7 @@ public void doCommit(ViewMetadata base, ViewMetadata metadata) { // for the storage configuration inherited under this entity's path. validateLocationForTableLike(identifier, metadata.location(), resolvedStorageEntity); validateNoLocationOverlap( - catalogEntity, - identifier, - resolvedNamespace, - metadata.location()); + catalogEntity, identifier, resolvedNamespace, metadata.location()); } Map tableProperties = new HashMap<>(metadata.properties()); diff --git a/polaris-service/src/test/java/org/apache/polaris/service/admin/PolarisOverlappingTableTest.java b/polaris-service/src/test/java/org/apache/polaris/service/admin/PolarisOverlappingTableTest.java index 6836f8927..c30a34558 100644 --- a/polaris-service/src/test/java/org/apache/polaris/service/admin/PolarisOverlappingTableTest.java +++ b/polaris-service/src/test/java/org/apache/polaris/service/admin/PolarisOverlappingTableTest.java @@ -141,7 +141,7 @@ public void setup(PolarisConnectionExtension.PolarisToken adminToken) { defaultCatalog.catalog = String.format("default_catalog_%s", UUID.randomUUID().toString()); laxCatalog.catalog = String.format("lax_catalog_%s", UUID.randomUUID().toString()); strictCatalog.catalog = String.format("strict_catalog_%s", UUID.randomUUID().toString()); - for (var EXT: List.of(BASE_EXT, LAX_EXT)) { + for (var EXT : List.of(BASE_EXT, LAX_EXT)) { for (var c : List.of(defaultCatalog, laxCatalog, strictCatalog)) { CatalogProperties.Builder propertiesBuilder = CatalogProperties.builder() @@ -149,8 +149,7 @@ public void setup(PolarisConnectionExtension.PolarisToken adminToken) { if (!c.equals(defaultCatalog)) { propertiesBuilder .addProperty( - PolarisConfiguration.ALLOW_UNSTRUCTURED_TABLE_LOCATION - .catalogConfig(), + PolarisConfiguration.ALLOW_UNSTRUCTURED_TABLE_LOCATION.catalogConfig(), String.valueOf(c.equals(laxCatalog))) .addProperty( PolarisConfiguration.ALLOW_TABLE_LOCATION_OVERLAP.catalogConfig(), @@ -170,8 +169,8 @@ public void setup(PolarisConnectionExtension.PolarisToken adminToken) { 1, config); try (Response response = - request(EXT, "management/v1/catalogs") - .post(Entity.json(new CreateCatalogRequest(catalogObject)))) { + request(EXT, "management/v1/catalogs") + .post(Entity.json(new CreateCatalogRequest(catalogObject)))) { if (response.getStatus() != Response.Status.CREATED.getStatusCode()) { throw new IllegalStateException( "Failed to create catalog: " + response.readEntity(String.class)); @@ -180,12 +179,10 @@ public void setup(PolarisConnectionExtension.PolarisToken adminToken) { namespace = "ns"; CreateNamespaceRequest createNamespaceRequest = - CreateNamespaceRequest.builder() - .withNamespace(Namespace.of(namespace)) - .build(); + CreateNamespaceRequest.builder().withNamespace(Namespace.of(namespace)).build(); try (Response response = - request(EXT, String.format("catalog/v1/%s/namespaces", c)) - .post(Entity.json(createNamespaceRequest))) { + request(EXT, String.format("catalog/v1/%s/namespaces", c)) + .post(Entity.json(createNamespaceRequest))) { if (response.getStatus() != Response.Status.OK.getStatusCode()) { throw new IllegalStateException( "Failed to create namespace: " + response.readEntity(String.class));