From 815d42bd1eae453286cfb644a26a09d5073dea81 Mon Sep 17 00:00:00 2001 From: Robert Stupp Date: Wed, 21 Aug 2024 12:52:55 +0200 Subject: [PATCH] Rename `io.polaris` to `org.apache.polaris` --- ...pseLinkPolarisMetaStoreManagerFactory.java | 12 +- ...olarisEclipseLinkMetaStoreSessionImpl.java | 46 +++--- .../eclipselink/PolarisEclipseLinkStore.java | 34 ++-- .../main/resources/META-INF/persistence.xml | 14 +- .../PolarisEclipseLinkMetaStoreTest.java | 16 +- .../test/resources/META-INF/persistence.xml | 14 +- gradle.properties | 2 +- polaris-core/build.gradle.kts | 2 +- .../polaris/core/PolarisCallContext.java | 4 +- .../polaris/core/PolarisConfiguration.java | 2 +- .../core/PolarisConfigurationStore.java | 4 +- .../core/PolarisDefaultDiagServiceImpl.java | 2 +- .../polaris/core/PolarisDiagnostics.java | 2 +- .../auth/AuthenticatedPolarisPrincipal.java | 6 +- .../auth/PolarisAuthorizableOperation.java | 118 ++++++------- .../polaris/core/auth/PolarisAuthorizer.java | 156 +++++++++--------- .../core/catalog/PolarisCatalogHelpers.java | 4 +- .../polaris/core/context/CallContext.java | 8 +- .../polaris/core/context/RealmContext.java | 2 +- .../polaris/core/entity/AsyncTaskType.java | 2 +- .../polaris/core/entity/CatalogEntity.java | 34 ++-- .../core/entity/CatalogRoleEntity.java | 4 +- .../polaris/core/entity/NamespaceEntity.java | 4 +- .../core/entity/PolarisBaseEntity.java | 2 +- .../entity/PolarisChangeTrackingVersions.java | 2 +- .../core/entity/PolarisEntitiesActiveKey.java | 2 +- .../polaris/core/entity/PolarisEntity.java | 4 +- .../entity/PolarisEntityActiveRecord.java | 2 +- .../core/entity/PolarisEntityConstants.java | 2 +- .../core/entity/PolarisEntityCore.java | 2 +- .../polaris/core/entity/PolarisEntityId.java | 2 +- .../core/entity/PolarisEntitySubType.java | 2 +- .../core/entity/PolarisEntityType.java | 2 +- .../core/entity/PolarisGrantRecord.java | 2 +- .../core/entity/PolarisPrincipalSecrets.java | 2 +- .../polaris/core/entity/PolarisPrivilege.java | 2 +- .../core/entity/PolarisTaskConstants.java | 2 +- .../polaris/core/entity/PrincipalEntity.java | 4 +- .../core/entity/PrincipalRoleEntity.java | 4 +- .../polaris/core/entity/TableLikeEntity.java | 2 +- .../polaris/core/entity/TaskEntity.java | 8 +- .../core/monitor/PolarisMetricRegistry.java | 4 +- .../LocalPolarisMetaStoreManagerFactory.java | 30 ++-- .../persistence/MetaStoreManagerFactory.java | 10 +- .../persistence/PolarisEntityManager.java | 26 +-- .../persistence/PolarisEntityResolver.java | 18 +- .../persistence/PolarisMetaStoreManager.java | 30 ++-- .../PolarisMetaStoreManagerImpl.java | 42 ++--- .../persistence/PolarisMetaStoreSession.java | 28 ++-- .../persistence/PolarisObjectMapperUtil.java | 8 +- .../PolarisResolvedPathWrapper.java | 4 +- .../PolarisTreeMapMetaStoreSessionImpl.java | 28 ++-- .../core/persistence/PolarisTreeMapStore.java | 16 +- .../persistence/ResolvedPolarisEntity.java | 8 +- .../RetryOnConcurrencyException.java | 2 +- .../core/persistence/cache/EntityCache.java | 12 +- .../cache/EntityCacheByNameKey.java | 8 +- .../persistence/cache/EntityCacheEntry.java | 8 +- .../cache/EntityCacheLookupResult.java | 2 +- .../persistence/cache/EntityCacheMode.java | 2 +- .../core/persistence/models/ModelEntity.java | 8 +- .../persistence/models/ModelEntityActive.java | 8 +- .../models/ModelEntityChangeTracking.java | 4 +- .../models/ModelEntityDropped.java | 4 +- .../persistence/models/ModelGrantRecord.java | 4 +- .../models/ModelPrincipalSecrets.java | 4 +- .../persistence/models/ModelSequenceId.java | 2 +- .../resolver/PolarisResolutionManifest.java | 26 +-- .../PolarisResolutionManifestCatalogView.java | 6 +- .../core/persistence/resolver/Resolver.java | 32 ++-- .../resolver/ResolverEntityName.java | 4 +- .../persistence/resolver/ResolverPath.java | 4 +- .../resolver/ResolverPrincipalRole.java | 2 +- .../persistence/resolver/ResolverStatus.java | 4 +- .../polaris/core/resource/TimedApi.java | 8 +- .../storage/FileStorageConfigurationInfo.java | 2 +- .../storage/InMemoryStorageIntegration.java | 4 +- .../storage/PolarisCredentialProperty.java | 2 +- .../core/storage/PolarisStorageActions.java | 2 +- .../PolarisStorageConfigurationInfo.java | 22 +-- .../storage/PolarisStorageIntegration.java | 4 +- .../PolarisStorageIntegrationProvider.java | 2 +- .../storage/StorageConfigurationOverride.java | 2 +- .../polaris/core/storage/StorageUtil.java | 2 +- .../aws/AwsCredentialsStorageIntegration.java | 12 +- .../aws/AwsStorageConfigurationInfo.java | 4 +- .../aws/PolarisS3FileIOClientFactory.java | 2 +- .../AzureCredentialsStorageIntegration.java | 10 +- .../core/storage/azure/AzureLocation.java | 2 +- .../azure/AzureStorageConfigurationInfo.java | 4 +- .../storage/cache/StorageCredentialCache.java | 10 +- .../cache/StorageCredentialCacheEntry.java | 6 +- .../cache/StorageCredentialCacheKey.java | 10 +- .../gcp/GcpCredentialsStorageIntegration.java | 12 +- .../gcp/GcpStorageConfigurationInfo.java | 4 +- .../core/persistence/EntityCacheTest.java | 28 ++-- .../PolarisObjectMapperUtilTest.java | 8 +- .../PolarisTreeMapMetaStoreManagerTest.java | 10 +- .../core/persistence/ResolverTest.java | 32 ++-- .../InMemoryStorageIntegrationTest.java | 14 +- .../cache/StorageCredentialCacheTest.java | 32 ++-- .../AwsCredentialsStorageIntegrationTest.java | 12 +- ...AzureCredentialStorageIntegrationTest.java | 10 +- .../storage/azure/AzureLocationTest.java | 4 +- .../GcpCredentialsStorageIntegrationTest.java | 10 +- .../gcp/gcp-testGenerateAccessBoundary.json | 0 ...rateAccessBoundaryWithMultipleBuckets.json | 0 ...testGenerateAccessBoundaryWithoutList.json | 0 ...stGenerateAccessBoundaryWithoutWrites.json | 0 .../PolarisMetaStoreManagerTest.java | 22 +-- .../PolarisTestMetaStoreManager.java | 30 ++-- polaris-server.yml | 6 +- polaris-service/build.gradle.kts | 26 +-- .../service/BootstrapRealmsCommand.java | 16 +- .../service/IcebergExceptionMapper.java | 2 +- ...IcebergJerseyViolationExceptionMapper.java | 2 +- .../IcebergJsonProcessingExceptionMapper.java | 2 +- .../polaris/service/PolarisApplication.java | 72 ++++---- .../polaris/service/PolarisHealthCheck.java | 2 +- .../polaris/service/PurgeRealmsCommand.java | 14 +- .../TimedApplicationEventListener.java | 8 +- .../service/admin/PolarisAdminService.java | 92 +++++------ .../service/admin/PolarisServiceImpl.java | 88 +++++----- .../auth/BasePolarisAuthenticator.java | 22 +-- .../polaris/service/auth/DecodedToken.java | 2 +- .../service/auth/DefaultOAuth2ApiService.java | 12 +- .../auth/DefaultPolarisAuthenticator.java | 10 +- .../auth/DiscoverableAuthenticator.java | 4 +- .../polaris/service/auth/JWTBroker.java | 14 +- .../polaris/service/auth/JWTRSAKeyPair.java | 4 +- .../service/auth/JWTRSAKeyPairFactory.java | 8 +- .../service/auth/JWTSymmetricKeyBroker.java | 4 +- .../service/auth/JWTSymmetricKeyFactory.java | 8 +- .../polaris/service/auth/KeyProvider.java | 2 +- .../service/auth/LocalRSAKeyProvider.java | 6 +- .../service/auth/OAuthTokenErrorResponse.java | 2 +- .../polaris/service/auth/OAuthUtils.java | 2 +- .../polaris/service/auth/PemUtils.java | 2 +- ...InlineBearerTokenPolarisAuthenticator.java | 12 +- .../service/auth/TestOAuth2ApiService.java | 22 +-- .../polaris/service/auth/TokenBroker.java | 16 +- .../service/auth/TokenBrokerFactory.java | 4 +- .../auth/TokenInfoExchangeResponse.java | 2 +- .../service/auth/TokenRequestValidator.java | 2 +- .../polaris/service/auth/TokenResponse.java | 2 +- .../service/catalog/BasePolarisCatalog.java | 60 +++---- .../catalog/IcebergCatalogAdapter.java | 34 ++-- .../catalog/PolarisCatalogHandlerWrapper.java | 41 ++--- .../catalog/SupportsCredentialDelegation.java | 4 +- .../catalog/SupportsNotifications.java | 4 +- .../config/ConfigurationStoreAware.java | 4 +- .../service/config/CorsConfiguration.java | 2 +- .../config/DefaultConfigurationStore.java | 6 +- .../config/HasEntityManagerFactory.java | 2 +- .../service/config/OAuth2ApiService.java | 6 +- .../config/PolarisApplicationConfig.java | 14 +- .../config/RealmEntityManagerFactory.java | 8 +- .../polaris/service/config/Serializers.java | 28 ++-- .../config/TaskHandlerConfiguration.java | 2 +- .../context/CallContextCatalogFactory.java | 8 +- .../service/context/CallContextResolver.java | 8 +- .../context/DefaultContextResolver.java | 22 +-- .../PolarisCallContextCatalogFactory.java | 20 +-- .../service/context/RealmContextResolver.java | 6 +- .../logging/PolarisJsonLayoutFactory.java | 2 +- ...nMemoryPolarisMetaStoreManagerFactory.java | 16 +- .../polaris/service/resource/TimedApi.java | 7 +- ...PolarisStorageIntegrationProviderImpl.java | 20 +-- .../task/ManifestFileCleanupTaskHandler.java | 6 +- .../service/task/TableCleanupTaskHandler.java | 22 +-- .../polaris/service/task/TaskExecutor.java | 4 +- .../service/task/TaskExecutorImpl.java | 16 +- .../service/task/TaskFileIOSupplier.java | 12 +- .../polaris/service/task/TaskHandler.java | 4 +- .../polaris/service/task/TaskUtils.java | 2 +- .../service/tracing/HeadersMapAccessor.java | 2 +- .../service/tracing/OpenTelemetryAware.java | 2 +- .../service/tracing/TracingFilter.java | 4 +- .../service/types/CommitTableRequest.java | 2 +- .../service/types/CommitViewRequest.java | 2 +- .../service/types/NotificationRequest.java | 2 +- .../service/types/NotificationType.java | 2 +- .../types/TableUpdateNotification.java | 2 +- .../polaris/service/types/TokenType.java | 2 +- .../io.dropwizard.jackson.Discoverable | 12 +- ...ng.common.layout.DiscoverableLayoutFactory | 2 +- ....core.persistence.MetaStoreManagerFactory} | 4 +- ...e.polaris.service.auth.TokenBrokerFactory} | 4 +- ...e.polaris.service.config.OAuth2ApiService} | 4 +- ...laris.service.context.CallContextResolver} | 2 +- ...aris.service.context.RealmContextResolver} | 2 +- .../apache}/polaris/service/banner.txt | 0 .../PolarisApplicationIntegrationTest.java | 34 ++-- .../admin/PolarisAdminServiceAuthzTest.java | 22 +-- .../service/admin/PolarisAuthzTestBase.java | 70 ++++---- .../admin/PolarisOverlappingCatalogTest.java | 20 +-- .../PolarisServiceImplIntegrationTest.java | 66 ++++---- .../service/auth/JWTRSAKeyPairTest.java | 24 +-- .../auth/JWTSymmetricKeyGeneratorTest.java | 22 +-- .../auth/TokenRequestValidatorTest.java | 2 +- .../polaris/service/auth/TokenUtils.java | 4 +- .../catalog/BasePolarisCatalogTest.java | 74 ++++----- .../catalog/BasePolarisCatalogViewTest.java | 46 +++--- ...PolarisCatalogHandlerWrapperAuthzTest.java | 40 ++--- .../PolarisPassthroughResolutionView.java | 22 +-- .../PolarisRestCatalogIntegrationTest.java | 70 ++++---- ...PolarisRestCatalogViewIntegrationTest.java | 44 ++--- .../catalog/PolarisSparkIntegrationTest.java | 28 ++-- .../service/entity/CatalogEntityTest.java | 18 +- .../ManifestFileCleanupTaskHandlerTest.java | 16 +- .../task/TableCleanupTaskHandlerTest.java | 22 +-- .../polaris/service/task/TaskTestUtils.java | 2 +- .../polaris/service/task/TestSnapshot.java | 2 +- .../test/PolarisConnectionExtension.java | 40 ++--- .../test/SnowmanCredentialsExtension.java | 16 +- ...is.service.auth.DiscoverableAuthenticator} | 2 +- .../polaris-server-integrationtest.yml | 4 +- server-templates/api.mustache | 2 +- 218 files changed, 1462 insertions(+), 1458 deletions(-) rename extension/persistence/eclipselink/src/main/java/{io => org/apache}/polaris/extension/persistence/impl/eclipselink/EclipseLinkPolarisMetaStoreManagerFactory.java (83%) rename extension/persistence/eclipselink/src/main/java/{io => org/apache}/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreSessionImpl.java (94%) rename extension/persistence/eclipselink/src/main/java/{io => org/apache}/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkStore.java (93%) rename extension/persistence/eclipselink/src/test/java/{io => org/apache}/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreTest.java (86%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/PolarisCallContext.java (95%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/PolarisConfiguration.java (99%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/PolarisConfigurationStore.java (97%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/PolarisDefaultDiagServiceImpl.java (99%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/PolarisDiagnostics.java (99%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/auth/AuthenticatedPolarisPrincipal.java (94%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/auth/PolarisAuthorizableOperation.java (63%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/auth/PolarisAuthorizer.java (77%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/catalog/PolarisCatalogHelpers.java (97%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/context/CallContext.java (96%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/context/RealmContext.java (96%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/entity/AsyncTaskType.java (97%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/entity/CatalogEntity.java (91%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/entity/CatalogRoleEntity.java (95%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/entity/NamespaceEntity.java (96%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/entity/PolarisBaseEntity.java (99%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/entity/PolarisChangeTrackingVersions.java (98%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/entity/PolarisEntitiesActiveKey.java (98%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/entity/PolarisEntity.java (99%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/entity/PolarisEntityActiveRecord.java (98%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/entity/PolarisEntityConstants.java (98%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/entity/PolarisEntityCore.java (99%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/entity/PolarisEntityId.java (98%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/entity/PolarisEntitySubType.java (98%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/entity/PolarisEntityType.java (99%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/entity/PolarisGrantRecord.java (99%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/entity/PolarisPrincipalSecrets.java (98%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/entity/PolarisPrivilege.java (99%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/entity/PolarisTaskConstants.java (97%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/entity/PrincipalEntity.java (96%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/entity/PrincipalRoleEntity.java (95%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/entity/TableLikeEntity.java (98%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/entity/TaskEntity.java (94%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/monitor/PolarisMetricRegistry.java (98%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/persistence/LocalPolarisMetaStoreManagerFactory.java (92%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/persistence/MetaStoreManagerFactory.java (86%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/persistence/PolarisEntityManager.java (87%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/persistence/PolarisEntityResolver.java (95%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/persistence/PolarisMetaStoreManager.java (98%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/persistence/PolarisMetaStoreManagerImpl.java (98%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/persistence/PolarisMetaStoreSession.java (96%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/persistence/PolarisObjectMapperUtil.java (96%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/persistence/PolarisResolvedPathWrapper.java (96%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/persistence/PolarisTreeMapMetaStoreSessionImpl.java (95%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/persistence/PolarisTreeMapStore.java (97%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/persistence/ResolvedPolarisEntity.java (92%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/persistence/RetryOnConcurrencyException.java (96%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/persistence/cache/EntityCache.java (98%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/persistence/cache/EntityCacheByNameKey.java (93%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/persistence/cache/EntityCacheEntry.java (95%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/persistence/cache/EntityCacheLookupResult.java (96%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/persistence/cache/EntityCacheMode.java (95%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/persistence/models/ModelEntity.java (97%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/persistence/models/ModelEntityActive.java (93%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/persistence/models/ModelEntityChangeTracking.java (95%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/persistence/models/ModelEntityDropped.java (97%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/persistence/models/ModelGrantRecord.java (97%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/persistence/models/ModelPrincipalSecrets.java (97%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/persistence/models/ModelSequenceId.java (96%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/persistence/resolver/PolarisResolutionManifest.java (95%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/persistence/resolver/PolarisResolutionManifestCatalogView.java (88%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/persistence/resolver/Resolver.java (97%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/persistence/resolver/ResolverEntityName.java (94%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/persistence/resolver/ResolverPath.java (96%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/persistence/resolver/ResolverPrincipalRole.java (94%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/persistence/resolver/ResolverStatus.java (96%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/resource/TimedApi.java (86%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/storage/FileStorageConfigurationInfo.java (97%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/storage/InMemoryStorageIntegration.java (98%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/storage/PolarisCredentialProperty.java (98%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/storage/PolarisStorageActions.java (96%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/storage/PolarisStorageConfigurationInfo.java (93%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/storage/PolarisStorageIntegration.java (98%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/storage/PolarisStorageIntegrationProvider.java (96%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/storage/StorageConfigurationOverride.java (98%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/storage/StorageUtil.java (97%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/storage/aws/AwsCredentialsStorageIntegration.java (95%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/storage/aws/AwsStorageConfigurationInfo.java (97%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/storage/aws/PolarisS3FileIOClientFactory.java (98%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/storage/azure/AzureCredentialsStorageIntegration.java (97%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/storage/azure/AzureLocation.java (98%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/storage/azure/AzureStorageConfigurationInfo.java (96%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/storage/cache/StorageCredentialCache.java (96%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/storage/cache/StorageCredentialCacheEntry.java (94%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/storage/cache/StorageCredentialCacheKey.java (94%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/storage/gcp/GcpCredentialsStorageIntegration.java (96%) rename polaris-core/src/main/java/{io => org/apache}/polaris/core/storage/gcp/GcpStorageConfigurationInfo.java (95%) rename polaris-core/src/test/java/{io => org/apache}/polaris/core/persistence/EntityCacheTest.java (96%) rename polaris-core/src/test/java/{io => org/apache}/polaris/core/persistence/PolarisObjectMapperUtilTest.java (93%) rename polaris-core/src/test/java/{io => org/apache}/polaris/core/persistence/PolarisTreeMapMetaStoreManagerTest.java (85%) rename polaris-core/src/test/java/{io => org/apache}/polaris/core/persistence/ResolverTest.java (97%) rename polaris-core/src/test/java/{io => org/apache}/polaris/core/storage/InMemoryStorageIntegrationTest.java (95%) rename polaris-core/src/test/java/{io => org/apache}/polaris/core/storage/cache/StorageCredentialCacheTest.java (94%) rename polaris-core/src/test/java/{io => org/apache}/polaris/service/storage/aws/AwsCredentialsStorageIntegrationTest.java (98%) rename polaris-core/src/test/java/{io => org/apache}/polaris/service/storage/azure/AzureCredentialStorageIntegrationTest.java (98%) rename polaris-core/src/test/java/{io => org/apache}/polaris/service/storage/azure/AzureLocationTest.java (94%) rename polaris-core/src/test/java/{io => org/apache}/polaris/service/storage/gcp/GcpCredentialsStorageIntegrationTest.java (97%) rename polaris-core/src/test/resources/{io => org/apache}/polaris/service/storage/gcp/gcp-testGenerateAccessBoundary.json (100%) rename polaris-core/src/test/resources/{io => org/apache}/polaris/service/storage/gcp/gcp-testGenerateAccessBoundaryWithMultipleBuckets.json (100%) rename polaris-core/src/test/resources/{io => org/apache}/polaris/service/storage/gcp/gcp-testGenerateAccessBoundaryWithoutList.json (100%) rename polaris-core/src/test/resources/{io => org/apache}/polaris/service/storage/gcp/gcp-testGenerateAccessBoundaryWithoutWrites.json (100%) rename polaris-core/src/testFixtures/java/{io => org/apache}/polaris/core/persistence/PolarisMetaStoreManagerTest.java (96%) rename polaris-core/src/testFixtures/java/{io => org/apache}/polaris/core/persistence/PolarisTestMetaStoreManager.java (99%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/BootstrapRealmsCommand.java (87%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/IcebergExceptionMapper.java (99%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/IcebergJerseyViolationExceptionMapper.java (98%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/IcebergJsonProcessingExceptionMapper.java (98%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/PolarisApplication.java (87%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/PolarisHealthCheck.java (96%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/PurgeRealmsCommand.java (85%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/TimedApplicationEventListener.java (94%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/admin/PolarisAdminService.java (96%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/admin/PolarisServiceImpl.java (90%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/auth/BasePolarisAuthenticator.java (88%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/auth/DecodedToken.java (95%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/auth/DefaultOAuth2ApiService.java (94%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/auth/DefaultPolarisAuthenticator.java (86%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/auth/DiscoverableAuthenticator.java (93%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/auth/JWTBroker.java (94%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/auth/JWTRSAKeyPair.java (93%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/auth/JWTRSAKeyPairFactory.java (87%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/auth/JWTSymmetricKeyBroker.java (92%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/auth/JWTSymmetricKeyFactory.java (91%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/auth/KeyProvider.java (96%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/auth/LocalRSAKeyProvider.java (95%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/auth/OAuthTokenErrorResponse.java (98%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/auth/OAuthUtils.java (98%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/auth/PemUtils.java (98%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/auth/TestInlineBearerTokenPolarisAuthenticator.java (91%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/auth/TestOAuth2ApiService.java (87%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/auth/TokenBroker.java (85%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/auth/TokenBrokerFactory.java (93%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/auth/TokenInfoExchangeResponse.java (98%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/auth/TokenRequestValidator.java (98%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/auth/TokenResponse.java (97%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/catalog/BasePolarisCatalog.java (97%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/catalog/IcebergCatalogAdapter.java (94%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/catalog/PolarisCatalogHandlerWrapper.java (97%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/catalog/SupportsCredentialDelegation.java (93%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/catalog/SupportsNotifications.java (90%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/config/ConfigurationStoreAware.java (90%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/config/CorsConfiguration.java (98%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/config/DefaultConfigurationStore.java (89%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/config/HasEntityManagerFactory.java (95%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/config/OAuth2ApiService.java (86%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/config/PolarisApplicationConfig.java (92%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/config/RealmEntityManagerFactory.java (91%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/config/Serializers.java (91%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/config/TaskHandlerConfiguration.java (97%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/context/CallContextCatalogFactory.java (81%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/context/CallContextResolver.java (86%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/context/DefaultContextResolver.java (90%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/context/PolarisCallContextCatalogFactory.java (85%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/context/RealmContextResolver.java (88%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/logging/PolarisJsonLayoutFactory.java (99%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/persistence/InMemoryPolarisMetaStoreManagerFactory.java (85%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/resource/TimedApi.java (84%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/storage/PolarisStorageIntegrationProviderImpl.java (86%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/task/ManifestFileCleanupTaskHandler.java (98%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/task/TableCleanupTaskHandler.java (92%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/task/TaskExecutor.java (92%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/task/TaskExecutorImpl.java (92%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/task/TaskFileIOSupplier.java (87%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/task/TaskHandler.java (91%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/task/TaskUtils.java (97%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/tracing/HeadersMapAccessor.java (97%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/tracing/OpenTelemetryAware.java (95%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/tracing/TracingFilter.java (97%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/types/CommitTableRequest.java (95%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/types/CommitViewRequest.java (95%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/types/NotificationRequest.java (98%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/types/NotificationType.java (98%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/types/TableUpdateNotification.java (99%) rename polaris-service/src/main/java/{io => org/apache}/polaris/service/types/TokenType.java (97%) rename polaris-service/src/main/resources/META-INF/services/{io.polaris.core.persistence.MetaStoreManagerFactory => org.apache.polaris.core.persistence.MetaStoreManagerFactory} (81%) rename polaris-service/src/main/resources/META-INF/services/{io.polaris.service.auth.TokenBrokerFactory => org.apache.polaris.service.auth.TokenBrokerFactory} (88%) rename polaris-service/src/main/resources/META-INF/services/{io.polaris.service.config.OAuth2ApiService => org.apache.polaris.service.config.OAuth2ApiService} (87%) rename polaris-service/src/main/resources/META-INF/services/{io.polaris.service.context.CallContextResolver => org.apache.polaris.service.context.CallContextResolver} (93%) rename polaris-service/src/main/resources/META-INF/services/{io.polaris.service.context.RealmContextResolver => org.apache.polaris.service.context.RealmContextResolver} (93%) rename polaris-service/src/main/resources/{io => org/apache}/polaris/service/banner.txt (100%) rename polaris-service/src/test/java/{io => org/apache}/polaris/service/PolarisApplicationIntegrationTest.java (96%) rename polaris-service/src/test/java/{io => org/apache}/polaris/service/admin/PolarisAdminServiceAuthzTest.java (98%) rename polaris-service/src/test/java/{io => org/apache}/polaris/service/admin/PolarisAuthzTestBase.java (90%) rename polaris-service/src/test/java/{io => org/apache}/polaris/service/admin/PolarisOverlappingCatalogTest.java (93%) rename polaris-service/src/test/java/{io => org/apache}/polaris/service/admin/PolarisServiceImplIntegrationTest.java (97%) rename polaris-service/src/test/java/{io => org/apache}/polaris/service/auth/JWTRSAKeyPairTest.java (89%) rename polaris-service/src/test/java/{io => org/apache}/polaris/service/auth/JWTSymmetricKeyGeneratorTest.java (84%) rename polaris-service/src/test/java/{io => org/apache}/polaris/service/auth/TokenRequestValidatorTest.java (98%) rename polaris-service/src/test/java/{io => org/apache}/polaris/service/auth/TokenUtils.java (94%) rename polaris-service/src/test/java/{io => org/apache}/polaris/service/catalog/BasePolarisCatalogTest.java (95%) rename polaris-service/src/test/java/{io => org/apache}/polaris/service/catalog/BasePolarisCatalogViewTest.java (78%) rename polaris-service/src/test/java/{io => org/apache}/polaris/service/catalog/PolarisCatalogHandlerWrapperAuthzTest.java (98%) rename polaris-service/src/test/java/{io => org/apache}/polaris/service/catalog/PolarisPassthroughResolutionView.java (88%) rename polaris-service/src/test/java/{io => org/apache}/polaris/service/catalog/PolarisRestCatalogIntegrationTest.java (93%) rename polaris-service/src/test/java/{io => org/apache}/polaris/service/catalog/PolarisRestCatalogViewIntegrationTest.java (89%) rename polaris-service/src/test/java/{io => org/apache}/polaris/service/catalog/PolarisSparkIntegrationTest.java (94%) rename polaris-service/src/test/java/{io => org/apache}/polaris/service/entity/CatalogEntityTest.java (94%) rename polaris-service/src/test/java/{io => org/apache}/polaris/service/task/ManifestFileCleanupTaskHandlerTest.java (95%) rename polaris-service/src/test/java/{io => org/apache}/polaris/service/task/TableCleanupTaskHandlerTest.java (96%) rename polaris-service/src/test/java/{io => org/apache}/polaris/service/task/TaskTestUtils.java (98%) rename polaris-service/src/test/java/{io => org/apache}/polaris/service/task/TestSnapshot.java (98%) rename polaris-service/src/test/java/{io => org/apache}/polaris/service/test/PolarisConnectionExtension.java (88%) rename polaris-service/src/test/java/{io => org/apache}/polaris/service/test/SnowmanCredentialsExtension.java (94%) rename polaris-service/src/test/resources/META-INF/services/{io.polaris.service.auth.DiscoverableAuthenticator => org.apache.polaris.service.auth.DiscoverableAuthenticator} (91%) diff --git a/extension/persistence/eclipselink/src/main/java/io/polaris/extension/persistence/impl/eclipselink/EclipseLinkPolarisMetaStoreManagerFactory.java b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/EclipseLinkPolarisMetaStoreManagerFactory.java similarity index 83% rename from extension/persistence/eclipselink/src/main/java/io/polaris/extension/persistence/impl/eclipselink/EclipseLinkPolarisMetaStoreManagerFactory.java rename to extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/EclipseLinkPolarisMetaStoreManagerFactory.java index 0c46865ede..0415c0d5f9 100644 --- a/extension/persistence/eclipselink/src/main/java/io/polaris/extension/persistence/impl/eclipselink/EclipseLinkPolarisMetaStoreManagerFactory.java +++ b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/EclipseLinkPolarisMetaStoreManagerFactory.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.extension.persistence.impl.eclipselink; +package org.apache.polaris.extension.persistence.impl.eclipselink; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.polaris.core.PolarisDiagnostics; -import io.polaris.core.context.RealmContext; -import io.polaris.core.persistence.LocalPolarisMetaStoreManagerFactory; -import io.polaris.core.persistence.PolarisMetaStoreManager; -import io.polaris.core.persistence.PolarisMetaStoreSession; +import org.apache.polaris.core.PolarisDiagnostics; +import org.apache.polaris.core.context.RealmContext; +import org.apache.polaris.core.persistence.LocalPolarisMetaStoreManagerFactory; +import org.apache.polaris.core.persistence.PolarisMetaStoreManager; +import org.apache.polaris.core.persistence.PolarisMetaStoreSession; import org.jetbrains.annotations.NotNull; /** diff --git a/extension/persistence/eclipselink/src/main/java/io/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreSessionImpl.java b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreSessionImpl.java similarity index 94% rename from extension/persistence/eclipselink/src/main/java/io/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreSessionImpl.java rename to extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreSessionImpl.java index fb13ea9da9..dec10d3a4a 100644 --- a/extension/persistence/eclipselink/src/main/java/io/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreSessionImpl.java +++ b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreSessionImpl.java @@ -16,34 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.extension.persistence.impl.eclipselink; +package org.apache.polaris.extension.persistence.impl.eclipselink; import static org.eclipse.persistence.config.PersistenceUnitProperties.ECLIPSELINK_PERSISTENCE_XML; import static org.eclipse.persistence.config.PersistenceUnitProperties.JDBC_URL; import com.google.common.base.Predicates; -import io.polaris.core.PolarisCallContext; -import io.polaris.core.context.RealmContext; -import io.polaris.core.entity.PolarisBaseEntity; -import io.polaris.core.entity.PolarisChangeTrackingVersions; -import io.polaris.core.entity.PolarisEntitiesActiveKey; -import io.polaris.core.entity.PolarisEntityActiveRecord; -import io.polaris.core.entity.PolarisEntityCore; -import io.polaris.core.entity.PolarisEntityId; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.entity.PolarisGrantRecord; -import io.polaris.core.entity.PolarisPrincipalSecrets; -import io.polaris.core.persistence.PolarisMetaStoreManagerImpl; -import io.polaris.core.persistence.PolarisMetaStoreSession; -import io.polaris.core.persistence.RetryOnConcurrencyException; -import io.polaris.core.persistence.models.ModelEntity; -import io.polaris.core.persistence.models.ModelEntityActive; -import io.polaris.core.persistence.models.ModelEntityChangeTracking; -import io.polaris.core.persistence.models.ModelGrantRecord; -import io.polaris.core.persistence.models.ModelPrincipalSecrets; -import io.polaris.core.storage.PolarisStorageConfigurationInfo; -import io.polaris.core.storage.PolarisStorageIntegration; -import io.polaris.core.storage.PolarisStorageIntegrationProvider; import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.EntityTransaction; @@ -69,6 +47,28 @@ import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.context.RealmContext; +import org.apache.polaris.core.entity.PolarisBaseEntity; +import org.apache.polaris.core.entity.PolarisChangeTrackingVersions; +import org.apache.polaris.core.entity.PolarisEntitiesActiveKey; +import org.apache.polaris.core.entity.PolarisEntityActiveRecord; +import org.apache.polaris.core.entity.PolarisEntityCore; +import org.apache.polaris.core.entity.PolarisEntityId; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.entity.PolarisGrantRecord; +import org.apache.polaris.core.entity.PolarisPrincipalSecrets; +import org.apache.polaris.core.persistence.PolarisMetaStoreManagerImpl; +import org.apache.polaris.core.persistence.PolarisMetaStoreSession; +import org.apache.polaris.core.persistence.RetryOnConcurrencyException; +import org.apache.polaris.core.persistence.models.ModelEntity; +import org.apache.polaris.core.persistence.models.ModelEntityActive; +import org.apache.polaris.core.persistence.models.ModelEntityChangeTracking; +import org.apache.polaris.core.persistence.models.ModelGrantRecord; +import org.apache.polaris.core.persistence.models.ModelPrincipalSecrets; +import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo; +import org.apache.polaris.core.storage.PolarisStorageIntegration; +import org.apache.polaris.core.storage.PolarisStorageIntegrationProvider; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; diff --git a/extension/persistence/eclipselink/src/main/java/io/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkStore.java b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkStore.java similarity index 93% rename from extension/persistence/eclipselink/src/main/java/io/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkStore.java rename to extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkStore.java index c4243a2b17..02461fa4f9 100644 --- a/extension/persistence/eclipselink/src/main/java/io/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkStore.java +++ b/extension/persistence/eclipselink/src/main/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkStore.java @@ -16,28 +16,28 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.extension.persistence.impl.eclipselink; - -import io.polaris.core.PolarisDiagnostics; -import io.polaris.core.entity.PolarisBaseEntity; -import io.polaris.core.entity.PolarisEntitiesActiveKey; -import io.polaris.core.entity.PolarisEntityActiveRecord; -import io.polaris.core.entity.PolarisEntityCore; -import io.polaris.core.entity.PolarisEntityId; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.entity.PolarisGrantRecord; -import io.polaris.core.entity.PolarisPrincipalSecrets; -import io.polaris.core.persistence.models.ModelEntity; -import io.polaris.core.persistence.models.ModelEntityActive; -import io.polaris.core.persistence.models.ModelEntityChangeTracking; -import io.polaris.core.persistence.models.ModelEntityDropped; -import io.polaris.core.persistence.models.ModelGrantRecord; -import io.polaris.core.persistence.models.ModelPrincipalSecrets; +package org.apache.polaris.extension.persistence.impl.eclipselink; + import jakarta.persistence.EntityManager; import jakarta.persistence.TypedQuery; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; +import org.apache.polaris.core.PolarisDiagnostics; +import org.apache.polaris.core.entity.PolarisBaseEntity; +import org.apache.polaris.core.entity.PolarisEntitiesActiveKey; +import org.apache.polaris.core.entity.PolarisEntityActiveRecord; +import org.apache.polaris.core.entity.PolarisEntityCore; +import org.apache.polaris.core.entity.PolarisEntityId; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.entity.PolarisGrantRecord; +import org.apache.polaris.core.entity.PolarisPrincipalSecrets; +import org.apache.polaris.core.persistence.models.ModelEntity; +import org.apache.polaris.core.persistence.models.ModelEntityActive; +import org.apache.polaris.core.persistence.models.ModelEntityChangeTracking; +import org.apache.polaris.core.persistence.models.ModelEntityDropped; +import org.apache.polaris.core.persistence.models.ModelGrantRecord; +import org.apache.polaris.core.persistence.models.ModelPrincipalSecrets; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; diff --git a/extension/persistence/eclipselink/src/main/resources/META-INF/persistence.xml b/extension/persistence/eclipselink/src/main/resources/META-INF/persistence.xml index af4ae0e266..a364fe06c3 100644 --- a/extension/persistence/eclipselink/src/main/resources/META-INF/persistence.xml +++ b/extension/persistence/eclipselink/src/main/resources/META-INF/persistence.xml @@ -25,13 +25,13 @@ org.eclipse.persistence.jpa.PersistenceProvider - io.polaris.core.persistence.models.ModelEntity - io.polaris.core.persistence.models.ModelEntityActive - io.polaris.core.persistence.models.ModelEntityChangeTracking - io.polaris.core.persistence.models.ModelEntityDropped - io.polaris.core.persistence.models.ModelGrantRecord - io.polaris.core.persistence.models.ModelPrincipalSecrets - io.polaris.core.persistence.models.ModelSequenceId + org.apache.polaris.core.persistence.models.ModelEntity + org.apache.polaris.core.persistence.models.ModelEntityActive + org.apache.polaris.core.persistence.models.ModelEntityChangeTracking + org.apache.polaris.core.persistence.models.ModelEntityDropped + org.apache.polaris.core.persistence.models.ModelGrantRecord + org.apache.polaris.core.persistence.models.ModelPrincipalSecrets + org.apache.polaris.core.persistence.models.ModelSequenceId NONE org.eclipse.persistence.jpa.PersistenceProvider - io.polaris.core.persistence.models.ModelEntity - io.polaris.core.persistence.models.ModelEntityActive - io.polaris.core.persistence.models.ModelEntityChangeTracking - io.polaris.core.persistence.models.ModelEntityDropped - io.polaris.core.persistence.models.ModelGrantRecord - io.polaris.core.persistence.models.ModelPrincipalSecrets - io.polaris.core.persistence.models.ModelSequenceId + org.apache.polaris.core.persistence.models.ModelEntity + org.apache.polaris.core.persistence.models.ModelEntityActive + org.apache.polaris.core.persistence.models.ModelEntityChangeTracking + org.apache.polaris.core.persistence.models.ModelEntityDropped + org.apache.polaris.core.persistence.models.ModelGrantRecord + org.apache.polaris.core.persistence.models.ModelPrincipalSecrets + org.apache.polaris.core.persistence.models.ModelSequenceId NONE ("generatePolarisService").configure { inputSpec = "$rootDir/spec/polaris-management-service.yml" generatorName = "jaxrs-resteasy" outputDir = "$projectDir/build/generated" - modelPackage = "io.polaris.core.admin.model" + modelPackage = "org.apache.polaris.core.admin.model" ignoreFileOverride = "$rootDir/.openapi-generator-ignore" removeOperationIdPrefix = true templateDir = "$rootDir/server-templates" diff --git a/polaris-core/src/main/java/io/polaris/core/PolarisCallContext.java b/polaris-core/src/main/java/org/apache/polaris/core/PolarisCallContext.java similarity index 95% rename from polaris-core/src/main/java/io/polaris/core/PolarisCallContext.java rename to polaris-core/src/main/java/org/apache/polaris/core/PolarisCallContext.java index 88bfd635c4..15e3683c70 100644 --- a/polaris-core/src/main/java/io/polaris/core/PolarisCallContext.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/PolarisCallContext.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core; +package org.apache.polaris.core; -import io.polaris.core.persistence.PolarisMetaStoreSession; import java.time.Clock; import java.time.ZoneId; +import org.apache.polaris.core.persistence.PolarisMetaStoreSession; import org.jetbrains.annotations.NotNull; /** diff --git a/polaris-core/src/main/java/io/polaris/core/PolarisConfiguration.java b/polaris-core/src/main/java/org/apache/polaris/core/PolarisConfiguration.java similarity index 99% rename from polaris-core/src/main/java/io/polaris/core/PolarisConfiguration.java rename to polaris-core/src/main/java/org/apache/polaris/core/PolarisConfiguration.java index f2109844a5..31af621d81 100644 --- a/polaris-core/src/main/java/io/polaris/core/PolarisConfiguration.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/PolarisConfiguration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core; +package org.apache.polaris.core; import java.util.Optional; diff --git a/polaris-core/src/main/java/io/polaris/core/PolarisConfigurationStore.java b/polaris-core/src/main/java/org/apache/polaris/core/PolarisConfigurationStore.java similarity index 97% rename from polaris-core/src/main/java/io/polaris/core/PolarisConfigurationStore.java rename to polaris-core/src/main/java/org/apache/polaris/core/PolarisConfigurationStore.java index 9b7e160ec6..a249ed907b 100644 --- a/polaris-core/src/main/java/io/polaris/core/PolarisConfigurationStore.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/PolarisConfigurationStore.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core; +package org.apache.polaris.core; import com.google.common.base.Preconditions; -import io.polaris.core.entity.CatalogEntity; +import org.apache.polaris.core.entity.CatalogEntity; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/polaris-core/src/main/java/io/polaris/core/PolarisDefaultDiagServiceImpl.java b/polaris-core/src/main/java/org/apache/polaris/core/PolarisDefaultDiagServiceImpl.java similarity index 99% rename from polaris-core/src/main/java/io/polaris/core/PolarisDefaultDiagServiceImpl.java rename to polaris-core/src/main/java/org/apache/polaris/core/PolarisDefaultDiagServiceImpl.java index b30193a9b3..644bd10e02 100644 --- a/polaris-core/src/main/java/io/polaris/core/PolarisDefaultDiagServiceImpl.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/PolarisDefaultDiagServiceImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core; +package org.apache.polaris.core; import com.google.common.base.Preconditions; import java.util.Arrays; diff --git a/polaris-core/src/main/java/io/polaris/core/PolarisDiagnostics.java b/polaris-core/src/main/java/org/apache/polaris/core/PolarisDiagnostics.java similarity index 99% rename from polaris-core/src/main/java/io/polaris/core/PolarisDiagnostics.java rename to polaris-core/src/main/java/org/apache/polaris/core/PolarisDiagnostics.java index c7173158f4..59a5292028 100644 --- a/polaris-core/src/main/java/io/polaris/core/PolarisDiagnostics.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/PolarisDiagnostics.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core; +package org.apache.polaris.core; import org.jetbrains.annotations.Contract; diff --git a/polaris-core/src/main/java/io/polaris/core/auth/AuthenticatedPolarisPrincipal.java b/polaris-core/src/main/java/org/apache/polaris/core/auth/AuthenticatedPolarisPrincipal.java similarity index 94% rename from polaris-core/src/main/java/io/polaris/core/auth/AuthenticatedPolarisPrincipal.java rename to polaris-core/src/main/java/org/apache/polaris/core/auth/AuthenticatedPolarisPrincipal.java index c262295049..4929b8c5e0 100644 --- a/polaris-core/src/main/java/io/polaris/core/auth/AuthenticatedPolarisPrincipal.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/auth/AuthenticatedPolarisPrincipal.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.auth; +package org.apache.polaris.core.auth; -import io.polaris.core.entity.PolarisEntity; -import io.polaris.core.entity.PrincipalRoleEntity; import java.util.List; import java.util.Set; +import org.apache.polaris.core.entity.PolarisEntity; +import org.apache.polaris.core.entity.PrincipalRoleEntity; import org.jetbrains.annotations.NotNull; /** Holds the results of request authentication. */ diff --git a/polaris-core/src/main/java/io/polaris/core/auth/PolarisAuthorizableOperation.java b/polaris-core/src/main/java/org/apache/polaris/core/auth/PolarisAuthorizableOperation.java similarity index 63% rename from polaris-core/src/main/java/io/polaris/core/auth/PolarisAuthorizableOperation.java rename to polaris-core/src/main/java/org/apache/polaris/core/auth/PolarisAuthorizableOperation.java index 80d98dd909..97ff58b464 100644 --- a/polaris-core/src/main/java/io/polaris/core/auth/PolarisAuthorizableOperation.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/auth/PolarisAuthorizableOperation.java @@ -16,68 +16,68 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.auth; +package org.apache.polaris.core.auth; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_CREATE; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_DROP; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_LIST; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_LIST_GRANTS; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_MANAGE_GRANTS_ON_SECURABLE; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_READ_PROPERTIES; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_CREATE; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_DROP; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_LIST; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_LIST_GRANTS; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_MANAGE_GRANTS_FOR_GRANTEE; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_MANAGE_GRANTS_ON_SECURABLE; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_READ_PROPERTIES; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_WRITE_PROPERTIES; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_WRITE_PROPERTIES; -import static io.polaris.core.entity.PolarisPrivilege.NAMESPACE_CREATE; -import static io.polaris.core.entity.PolarisPrivilege.NAMESPACE_DROP; -import static io.polaris.core.entity.PolarisPrivilege.NAMESPACE_LIST; -import static io.polaris.core.entity.PolarisPrivilege.NAMESPACE_LIST_GRANTS; -import static io.polaris.core.entity.PolarisPrivilege.NAMESPACE_MANAGE_GRANTS_ON_SECURABLE; -import static io.polaris.core.entity.PolarisPrivilege.NAMESPACE_READ_PROPERTIES; -import static io.polaris.core.entity.PolarisPrivilege.NAMESPACE_WRITE_PROPERTIES; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_CREATE; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_DROP; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_LIST; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_LIST_GRANTS; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_MANAGE_GRANTS_FOR_GRANTEE; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_MANAGE_GRANTS_ON_SECURABLE; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_READ_PROPERTIES; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_RESET_CREDENTIALS; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_CREATE; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_DROP; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_LIST; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_LIST_GRANTS; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_MANAGE_GRANTS_FOR_GRANTEE; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_MANAGE_GRANTS_ON_SECURABLE; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_READ_PROPERTIES; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_WRITE_PROPERTIES; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROTATE_CREDENTIALS; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_WRITE_PROPERTIES; -import static io.polaris.core.entity.PolarisPrivilege.SERVICE_MANAGE_ACCESS; -import static io.polaris.core.entity.PolarisPrivilege.TABLE_CREATE; -import static io.polaris.core.entity.PolarisPrivilege.TABLE_DROP; -import static io.polaris.core.entity.PolarisPrivilege.TABLE_LIST; -import static io.polaris.core.entity.PolarisPrivilege.TABLE_LIST_GRANTS; -import static io.polaris.core.entity.PolarisPrivilege.TABLE_MANAGE_GRANTS_ON_SECURABLE; -import static io.polaris.core.entity.PolarisPrivilege.TABLE_READ_DATA; -import static io.polaris.core.entity.PolarisPrivilege.TABLE_READ_PROPERTIES; -import static io.polaris.core.entity.PolarisPrivilege.TABLE_WRITE_DATA; -import static io.polaris.core.entity.PolarisPrivilege.TABLE_WRITE_PROPERTIES; -import static io.polaris.core.entity.PolarisPrivilege.VIEW_CREATE; -import static io.polaris.core.entity.PolarisPrivilege.VIEW_DROP; -import static io.polaris.core.entity.PolarisPrivilege.VIEW_LIST; -import static io.polaris.core.entity.PolarisPrivilege.VIEW_LIST_GRANTS; -import static io.polaris.core.entity.PolarisPrivilege.VIEW_MANAGE_GRANTS_ON_SECURABLE; -import static io.polaris.core.entity.PolarisPrivilege.VIEW_READ_PROPERTIES; -import static io.polaris.core.entity.PolarisPrivilege.VIEW_WRITE_PROPERTIES; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_CREATE; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_DROP; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_LIST; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_LIST_GRANTS; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_MANAGE_GRANTS_ON_SECURABLE; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_READ_PROPERTIES; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_CREATE; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_DROP; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_LIST; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_LIST_GRANTS; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_MANAGE_GRANTS_FOR_GRANTEE; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_MANAGE_GRANTS_ON_SECURABLE; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_READ_PROPERTIES; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_WRITE_PROPERTIES; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_WRITE_PROPERTIES; +import static org.apache.polaris.core.entity.PolarisPrivilege.NAMESPACE_CREATE; +import static org.apache.polaris.core.entity.PolarisPrivilege.NAMESPACE_DROP; +import static org.apache.polaris.core.entity.PolarisPrivilege.NAMESPACE_LIST; +import static org.apache.polaris.core.entity.PolarisPrivilege.NAMESPACE_LIST_GRANTS; +import static org.apache.polaris.core.entity.PolarisPrivilege.NAMESPACE_MANAGE_GRANTS_ON_SECURABLE; +import static org.apache.polaris.core.entity.PolarisPrivilege.NAMESPACE_READ_PROPERTIES; +import static org.apache.polaris.core.entity.PolarisPrivilege.NAMESPACE_WRITE_PROPERTIES; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_CREATE; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_DROP; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_LIST; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_LIST_GRANTS; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_MANAGE_GRANTS_FOR_GRANTEE; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_MANAGE_GRANTS_ON_SECURABLE; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_READ_PROPERTIES; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_RESET_CREDENTIALS; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_CREATE; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_DROP; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_LIST; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_LIST_GRANTS; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_MANAGE_GRANTS_FOR_GRANTEE; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_MANAGE_GRANTS_ON_SECURABLE; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_READ_PROPERTIES; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_WRITE_PROPERTIES; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROTATE_CREDENTIALS; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_WRITE_PROPERTIES; +import static org.apache.polaris.core.entity.PolarisPrivilege.SERVICE_MANAGE_ACCESS; +import static org.apache.polaris.core.entity.PolarisPrivilege.TABLE_CREATE; +import static org.apache.polaris.core.entity.PolarisPrivilege.TABLE_DROP; +import static org.apache.polaris.core.entity.PolarisPrivilege.TABLE_LIST; +import static org.apache.polaris.core.entity.PolarisPrivilege.TABLE_LIST_GRANTS; +import static org.apache.polaris.core.entity.PolarisPrivilege.TABLE_MANAGE_GRANTS_ON_SECURABLE; +import static org.apache.polaris.core.entity.PolarisPrivilege.TABLE_READ_DATA; +import static org.apache.polaris.core.entity.PolarisPrivilege.TABLE_READ_PROPERTIES; +import static org.apache.polaris.core.entity.PolarisPrivilege.TABLE_WRITE_DATA; +import static org.apache.polaris.core.entity.PolarisPrivilege.TABLE_WRITE_PROPERTIES; +import static org.apache.polaris.core.entity.PolarisPrivilege.VIEW_CREATE; +import static org.apache.polaris.core.entity.PolarisPrivilege.VIEW_DROP; +import static org.apache.polaris.core.entity.PolarisPrivilege.VIEW_LIST; +import static org.apache.polaris.core.entity.PolarisPrivilege.VIEW_LIST_GRANTS; +import static org.apache.polaris.core.entity.PolarisPrivilege.VIEW_MANAGE_GRANTS_ON_SECURABLE; +import static org.apache.polaris.core.entity.PolarisPrivilege.VIEW_READ_PROPERTIES; +import static org.apache.polaris.core.entity.PolarisPrivilege.VIEW_WRITE_PROPERTIES; -import io.polaris.core.entity.PolarisPrivilege; import java.util.EnumSet; +import org.apache.polaris.core.entity.PolarisPrivilege; /** * Denotes the fine-grained expansion of all Polaris operations that are associated with some set of diff --git a/polaris-core/src/main/java/io/polaris/core/auth/PolarisAuthorizer.java b/polaris-core/src/main/java/org/apache/polaris/core/auth/PolarisAuthorizer.java similarity index 77% rename from polaris-core/src/main/java/io/polaris/core/auth/PolarisAuthorizer.java rename to polaris-core/src/main/java/org/apache/polaris/core/auth/PolarisAuthorizer.java index d7d2da2fdc..fd68c3316a 100644 --- a/polaris-core/src/main/java/io/polaris/core/auth/PolarisAuthorizer.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/auth/PolarisAuthorizer.java @@ -16,92 +16,92 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.auth; +package org.apache.polaris.core.auth; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_CREATE; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_DROP; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_FULL_METADATA; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_LIST; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_LIST_GRANTS; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_MANAGE_ACCESS; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_MANAGE_CONTENT; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_MANAGE_GRANTS_ON_SECURABLE; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_MANAGE_METADATA; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_READ_PROPERTIES; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_CREATE; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_DROP; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_FULL_METADATA; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_LIST; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_LIST_GRANTS; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_MANAGE_GRANTS_FOR_GRANTEE; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_MANAGE_GRANTS_ON_SECURABLE; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_READ_PROPERTIES; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_USAGE; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_WRITE_PROPERTIES; -import static io.polaris.core.entity.PolarisPrivilege.CATALOG_WRITE_PROPERTIES; -import static io.polaris.core.entity.PolarisPrivilege.NAMESPACE_CREATE; -import static io.polaris.core.entity.PolarisPrivilege.NAMESPACE_DROP; -import static io.polaris.core.entity.PolarisPrivilege.NAMESPACE_FULL_METADATA; -import static io.polaris.core.entity.PolarisPrivilege.NAMESPACE_LIST; -import static io.polaris.core.entity.PolarisPrivilege.NAMESPACE_LIST_GRANTS; -import static io.polaris.core.entity.PolarisPrivilege.NAMESPACE_MANAGE_GRANTS_ON_SECURABLE; -import static io.polaris.core.entity.PolarisPrivilege.NAMESPACE_READ_PROPERTIES; -import static io.polaris.core.entity.PolarisPrivilege.NAMESPACE_WRITE_PROPERTIES; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_CREATE; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_DROP; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_FULL_METADATA; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_LIST; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_LIST_GRANTS; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_MANAGE_GRANTS_FOR_GRANTEE; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_MANAGE_GRANTS_ON_SECURABLE; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_READ_PROPERTIES; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_RESET_CREDENTIALS; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_CREATE; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_DROP; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_FULL_METADATA; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_LIST; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_LIST_GRANTS; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_MANAGE_GRANTS_FOR_GRANTEE; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_MANAGE_GRANTS_ON_SECURABLE; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_READ_PROPERTIES; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_USAGE; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_WRITE_PROPERTIES; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROTATE_CREDENTIALS; -import static io.polaris.core.entity.PolarisPrivilege.PRINCIPAL_WRITE_PROPERTIES; -import static io.polaris.core.entity.PolarisPrivilege.SERVICE_MANAGE_ACCESS; -import static io.polaris.core.entity.PolarisPrivilege.TABLE_CREATE; -import static io.polaris.core.entity.PolarisPrivilege.TABLE_DROP; -import static io.polaris.core.entity.PolarisPrivilege.TABLE_FULL_METADATA; -import static io.polaris.core.entity.PolarisPrivilege.TABLE_LIST; -import static io.polaris.core.entity.PolarisPrivilege.TABLE_LIST_GRANTS; -import static io.polaris.core.entity.PolarisPrivilege.TABLE_MANAGE_GRANTS_ON_SECURABLE; -import static io.polaris.core.entity.PolarisPrivilege.TABLE_READ_DATA; -import static io.polaris.core.entity.PolarisPrivilege.TABLE_READ_PROPERTIES; -import static io.polaris.core.entity.PolarisPrivilege.TABLE_WRITE_DATA; -import static io.polaris.core.entity.PolarisPrivilege.TABLE_WRITE_PROPERTIES; -import static io.polaris.core.entity.PolarisPrivilege.VIEW_CREATE; -import static io.polaris.core.entity.PolarisPrivilege.VIEW_DROP; -import static io.polaris.core.entity.PolarisPrivilege.VIEW_FULL_METADATA; -import static io.polaris.core.entity.PolarisPrivilege.VIEW_LIST; -import static io.polaris.core.entity.PolarisPrivilege.VIEW_LIST_GRANTS; -import static io.polaris.core.entity.PolarisPrivilege.VIEW_MANAGE_GRANTS_ON_SECURABLE; -import static io.polaris.core.entity.PolarisPrivilege.VIEW_READ_PROPERTIES; -import static io.polaris.core.entity.PolarisPrivilege.VIEW_WRITE_PROPERTIES; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_CREATE; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_DROP; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_FULL_METADATA; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_LIST; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_LIST_GRANTS; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_MANAGE_ACCESS; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_MANAGE_CONTENT; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_MANAGE_GRANTS_ON_SECURABLE; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_MANAGE_METADATA; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_READ_PROPERTIES; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_CREATE; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_DROP; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_FULL_METADATA; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_LIST; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_LIST_GRANTS; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_MANAGE_GRANTS_FOR_GRANTEE; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_MANAGE_GRANTS_ON_SECURABLE; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_READ_PROPERTIES; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_USAGE; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_ROLE_WRITE_PROPERTIES; +import static org.apache.polaris.core.entity.PolarisPrivilege.CATALOG_WRITE_PROPERTIES; +import static org.apache.polaris.core.entity.PolarisPrivilege.NAMESPACE_CREATE; +import static org.apache.polaris.core.entity.PolarisPrivilege.NAMESPACE_DROP; +import static org.apache.polaris.core.entity.PolarisPrivilege.NAMESPACE_FULL_METADATA; +import static org.apache.polaris.core.entity.PolarisPrivilege.NAMESPACE_LIST; +import static org.apache.polaris.core.entity.PolarisPrivilege.NAMESPACE_LIST_GRANTS; +import static org.apache.polaris.core.entity.PolarisPrivilege.NAMESPACE_MANAGE_GRANTS_ON_SECURABLE; +import static org.apache.polaris.core.entity.PolarisPrivilege.NAMESPACE_READ_PROPERTIES; +import static org.apache.polaris.core.entity.PolarisPrivilege.NAMESPACE_WRITE_PROPERTIES; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_CREATE; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_DROP; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_FULL_METADATA; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_LIST; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_LIST_GRANTS; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_MANAGE_GRANTS_FOR_GRANTEE; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_MANAGE_GRANTS_ON_SECURABLE; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_READ_PROPERTIES; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_RESET_CREDENTIALS; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_CREATE; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_DROP; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_FULL_METADATA; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_LIST; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_LIST_GRANTS; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_MANAGE_GRANTS_FOR_GRANTEE; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_MANAGE_GRANTS_ON_SECURABLE; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_READ_PROPERTIES; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_USAGE; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROLE_WRITE_PROPERTIES; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_ROTATE_CREDENTIALS; +import static org.apache.polaris.core.entity.PolarisPrivilege.PRINCIPAL_WRITE_PROPERTIES; +import static org.apache.polaris.core.entity.PolarisPrivilege.SERVICE_MANAGE_ACCESS; +import static org.apache.polaris.core.entity.PolarisPrivilege.TABLE_CREATE; +import static org.apache.polaris.core.entity.PolarisPrivilege.TABLE_DROP; +import static org.apache.polaris.core.entity.PolarisPrivilege.TABLE_FULL_METADATA; +import static org.apache.polaris.core.entity.PolarisPrivilege.TABLE_LIST; +import static org.apache.polaris.core.entity.PolarisPrivilege.TABLE_LIST_GRANTS; +import static org.apache.polaris.core.entity.PolarisPrivilege.TABLE_MANAGE_GRANTS_ON_SECURABLE; +import static org.apache.polaris.core.entity.PolarisPrivilege.TABLE_READ_DATA; +import static org.apache.polaris.core.entity.PolarisPrivilege.TABLE_READ_PROPERTIES; +import static org.apache.polaris.core.entity.PolarisPrivilege.TABLE_WRITE_DATA; +import static org.apache.polaris.core.entity.PolarisPrivilege.TABLE_WRITE_PROPERTIES; +import static org.apache.polaris.core.entity.PolarisPrivilege.VIEW_CREATE; +import static org.apache.polaris.core.entity.PolarisPrivilege.VIEW_DROP; +import static org.apache.polaris.core.entity.PolarisPrivilege.VIEW_FULL_METADATA; +import static org.apache.polaris.core.entity.PolarisPrivilege.VIEW_LIST; +import static org.apache.polaris.core.entity.PolarisPrivilege.VIEW_LIST_GRANTS; +import static org.apache.polaris.core.entity.PolarisPrivilege.VIEW_MANAGE_GRANTS_ON_SECURABLE; +import static org.apache.polaris.core.entity.PolarisPrivilege.VIEW_READ_PROPERTIES; +import static org.apache.polaris.core.entity.PolarisPrivilege.VIEW_WRITE_PROPERTIES; import com.google.common.base.Preconditions; import com.google.common.collect.HashMultimap; import com.google.common.collect.SetMultimap; -import io.polaris.core.PolarisConfiguration; -import io.polaris.core.PolarisConfigurationStore; -import io.polaris.core.context.CallContext; -import io.polaris.core.entity.PolarisEntityConstants; -import io.polaris.core.entity.PolarisGrantRecord; -import io.polaris.core.entity.PolarisPrivilege; -import io.polaris.core.persistence.PolarisResolvedPathWrapper; -import io.polaris.core.persistence.ResolvedPolarisEntity; import java.util.List; import java.util.Set; import org.apache.iceberg.exceptions.ForbiddenException; +import org.apache.polaris.core.PolarisConfiguration; +import org.apache.polaris.core.PolarisConfigurationStore; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.entity.PolarisEntityConstants; +import org.apache.polaris.core.entity.PolarisGrantRecord; +import org.apache.polaris.core.entity.PolarisPrivilege; +import org.apache.polaris.core.persistence.PolarisResolvedPathWrapper; +import org.apache.polaris.core.persistence.ResolvedPolarisEntity; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; diff --git a/polaris-core/src/main/java/io/polaris/core/catalog/PolarisCatalogHelpers.java b/polaris-core/src/main/java/org/apache/polaris/core/catalog/PolarisCatalogHelpers.java similarity index 97% rename from polaris-core/src/main/java/io/polaris/core/catalog/PolarisCatalogHelpers.java rename to polaris-core/src/main/java/org/apache/polaris/core/catalog/PolarisCatalogHelpers.java index 0b1379ee93..ce0345bf39 100644 --- a/polaris-core/src/main/java/io/polaris/core/catalog/PolarisCatalogHelpers.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/catalog/PolarisCatalogHelpers.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.catalog; +package org.apache.polaris.core.catalog; import com.google.common.collect.ImmutableList; -import io.polaris.core.entity.PolarisEntity; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; import org.apache.iceberg.catalog.Namespace; import org.apache.iceberg.catalog.TableIdentifier; +import org.apache.polaris.core.entity.PolarisEntity; /** * Holds helper methods translating between persistence-layer structs and Iceberg objects shared by diff --git a/polaris-core/src/main/java/io/polaris/core/context/CallContext.java b/polaris-core/src/main/java/org/apache/polaris/core/context/CallContext.java similarity index 96% rename from polaris-core/src/main/java/io/polaris/core/context/CallContext.java rename to polaris-core/src/main/java/org/apache/polaris/core/context/CallContext.java index 948a6d9e51..583ff18eac 100644 --- a/polaris-core/src/main/java/io/polaris/core/context/CallContext.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/context/CallContext.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.context; +package org.apache.polaris.core.context; -import io.polaris.core.PolarisCallContext; -import io.polaris.core.PolarisDiagnostics; -import io.polaris.core.auth.AuthenticatedPolarisPrincipal; import java.io.IOException; import java.util.HashMap; import java.util.Map; import java.util.stream.Collectors; import org.apache.iceberg.io.CloseableGroup; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.PolarisDiagnostics; +import org.apache.polaris.core.auth.AuthenticatedPolarisPrincipal; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/polaris-core/src/main/java/io/polaris/core/context/RealmContext.java b/polaris-core/src/main/java/org/apache/polaris/core/context/RealmContext.java similarity index 96% rename from polaris-core/src/main/java/io/polaris/core/context/RealmContext.java rename to polaris-core/src/main/java/org/apache/polaris/core/context/RealmContext.java index 7f99a9c65c..9a6f242249 100644 --- a/polaris-core/src/main/java/io/polaris/core/context/RealmContext.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/context/RealmContext.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.context; +package org.apache.polaris.core.context; /** * Represents the elements of a REST request associated with routing to independent and isolated diff --git a/polaris-core/src/main/java/io/polaris/core/entity/AsyncTaskType.java b/polaris-core/src/main/java/org/apache/polaris/core/entity/AsyncTaskType.java similarity index 97% rename from polaris-core/src/main/java/io/polaris/core/entity/AsyncTaskType.java rename to polaris-core/src/main/java/org/apache/polaris/core/entity/AsyncTaskType.java index 359ffb779c..32c478e86c 100644 --- a/polaris-core/src/main/java/io/polaris/core/entity/AsyncTaskType.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/entity/AsyncTaskType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.entity; +package org.apache.polaris.core.entity; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/polaris-core/src/main/java/io/polaris/core/entity/CatalogEntity.java b/polaris-core/src/main/java/org/apache/polaris/core/entity/CatalogEntity.java similarity index 91% rename from polaris-core/src/main/java/io/polaris/core/entity/CatalogEntity.java rename to polaris-core/src/main/java/org/apache/polaris/core/entity/CatalogEntity.java index fddde59a1f..4a622e3072 100644 --- a/polaris-core/src/main/java/io/polaris/core/entity/CatalogEntity.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/entity/CatalogEntity.java @@ -16,25 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.entity; +package org.apache.polaris.core.entity; -import static io.polaris.core.admin.model.StorageConfigInfo.StorageTypeEnum.AZURE; +import static org.apache.polaris.core.admin.model.StorageConfigInfo.StorageTypeEnum.AZURE; -import io.polaris.core.PolarisDefaultDiagServiceImpl; -import io.polaris.core.admin.model.AwsStorageConfigInfo; -import io.polaris.core.admin.model.AzureStorageConfigInfo; -import io.polaris.core.admin.model.Catalog; -import io.polaris.core.admin.model.CatalogProperties; -import io.polaris.core.admin.model.ExternalCatalog; -import io.polaris.core.admin.model.FileStorageConfigInfo; -import io.polaris.core.admin.model.GcpStorageConfigInfo; -import io.polaris.core.admin.model.PolarisCatalog; -import io.polaris.core.admin.model.StorageConfigInfo; -import io.polaris.core.storage.FileStorageConfigurationInfo; -import io.polaris.core.storage.PolarisStorageConfigurationInfo; -import io.polaris.core.storage.aws.AwsStorageConfigurationInfo; -import io.polaris.core.storage.azure.AzureStorageConfigurationInfo; -import io.polaris.core.storage.gcp.GcpStorageConfigurationInfo; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -42,6 +27,21 @@ import java.util.Optional; import java.util.Set; import org.apache.iceberg.exceptions.BadRequestException; +import org.apache.polaris.core.PolarisDefaultDiagServiceImpl; +import org.apache.polaris.core.admin.model.AwsStorageConfigInfo; +import org.apache.polaris.core.admin.model.AzureStorageConfigInfo; +import org.apache.polaris.core.admin.model.Catalog; +import org.apache.polaris.core.admin.model.CatalogProperties; +import org.apache.polaris.core.admin.model.ExternalCatalog; +import org.apache.polaris.core.admin.model.FileStorageConfigInfo; +import org.apache.polaris.core.admin.model.GcpStorageConfigInfo; +import org.apache.polaris.core.admin.model.PolarisCatalog; +import org.apache.polaris.core.admin.model.StorageConfigInfo; +import org.apache.polaris.core.storage.FileStorageConfigurationInfo; +import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo; +import org.apache.polaris.core.storage.aws.AwsStorageConfigurationInfo; +import org.apache.polaris.core.storage.azure.AzureStorageConfigurationInfo; +import org.apache.polaris.core.storage.gcp.GcpStorageConfigurationInfo; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/polaris-core/src/main/java/io/polaris/core/entity/CatalogRoleEntity.java b/polaris-core/src/main/java/org/apache/polaris/core/entity/CatalogRoleEntity.java similarity index 95% rename from polaris-core/src/main/java/io/polaris/core/entity/CatalogRoleEntity.java rename to polaris-core/src/main/java/org/apache/polaris/core/entity/CatalogRoleEntity.java index 3ead6f3be9..3fcb183719 100644 --- a/polaris-core/src/main/java/io/polaris/core/entity/CatalogRoleEntity.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/entity/CatalogRoleEntity.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.entity; +package org.apache.polaris.core.entity; -import io.polaris.core.admin.model.CatalogRole; +import org.apache.polaris.core.admin.model.CatalogRole; /** Wrapper for translating between the REST CatalogRole object and the base PolarisEntity type. */ public class CatalogRoleEntity extends PolarisEntity { diff --git a/polaris-core/src/main/java/io/polaris/core/entity/NamespaceEntity.java b/polaris-core/src/main/java/org/apache/polaris/core/entity/NamespaceEntity.java similarity index 96% rename from polaris-core/src/main/java/io/polaris/core/entity/NamespaceEntity.java rename to polaris-core/src/main/java/org/apache/polaris/core/entity/NamespaceEntity.java index 9256ca0fb3..7fa65042a9 100644 --- a/polaris-core/src/main/java/io/polaris/core/entity/NamespaceEntity.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/entity/NamespaceEntity.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.entity; +package org.apache.polaris.core.entity; import com.fasterxml.jackson.annotation.JsonIgnore; -import io.polaris.core.catalog.PolarisCatalogHelpers; import org.apache.iceberg.catalog.Namespace; import org.apache.iceberg.rest.RESTUtil; +import org.apache.polaris.core.catalog.PolarisCatalogHelpers; /** * Namespace-specific subclass of the {@link PolarisEntity} that provides accessors interacting with diff --git a/polaris-core/src/main/java/io/polaris/core/entity/PolarisBaseEntity.java b/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisBaseEntity.java similarity index 99% rename from polaris-core/src/main/java/io/polaris/core/entity/PolarisBaseEntity.java rename to polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisBaseEntity.java index e76cc18851..148733f52d 100644 --- a/polaris-core/src/main/java/io/polaris/core/entity/PolarisBaseEntity.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisBaseEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.entity; +package org.apache.polaris.core.entity; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/polaris-core/src/main/java/io/polaris/core/entity/PolarisChangeTrackingVersions.java b/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisChangeTrackingVersions.java similarity index 98% rename from polaris-core/src/main/java/io/polaris/core/entity/PolarisChangeTrackingVersions.java rename to polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisChangeTrackingVersions.java index 074c24dae3..a36a877eda 100644 --- a/polaris-core/src/main/java/io/polaris/core/entity/PolarisChangeTrackingVersions.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisChangeTrackingVersions.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.entity; +package org.apache.polaris.core.entity; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/polaris-core/src/main/java/io/polaris/core/entity/PolarisEntitiesActiveKey.java b/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEntitiesActiveKey.java similarity index 98% rename from polaris-core/src/main/java/io/polaris/core/entity/PolarisEntitiesActiveKey.java rename to polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEntitiesActiveKey.java index a97fd717c6..eb8f440d7d 100644 --- a/polaris-core/src/main/java/io/polaris/core/entity/PolarisEntitiesActiveKey.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEntitiesActiveKey.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.entity; +package org.apache.polaris.core.entity; public class PolarisEntitiesActiveKey { diff --git a/polaris-core/src/main/java/io/polaris/core/entity/PolarisEntity.java b/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEntity.java similarity index 99% rename from polaris-core/src/main/java/io/polaris/core/entity/PolarisEntity.java rename to polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEntity.java index 1219bde871..d3ab781aa2 100644 --- a/polaris-core/src/main/java/io/polaris/core/entity/PolarisEntity.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEntity.java @@ -16,12 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.entity; +package org.apache.polaris.core.entity; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import io.polaris.core.persistence.PolarisMetaStoreManager; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -29,6 +28,7 @@ import java.util.Optional; import java.util.function.Predicate; import java.util.stream.Collectors; +import org.apache.polaris.core.persistence.PolarisMetaStoreManager; import org.jetbrains.annotations.NotNull; public class PolarisEntity extends PolarisBaseEntity { diff --git a/polaris-core/src/main/java/io/polaris/core/entity/PolarisEntityActiveRecord.java b/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEntityActiveRecord.java similarity index 98% rename from polaris-core/src/main/java/io/polaris/core/entity/PolarisEntityActiveRecord.java rename to polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEntityActiveRecord.java index e50cc62b3c..87682f4cb2 100644 --- a/polaris-core/src/main/java/io/polaris/core/entity/PolarisEntityActiveRecord.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEntityActiveRecord.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.entity; +package org.apache.polaris.core.entity; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/polaris-core/src/main/java/io/polaris/core/entity/PolarisEntityConstants.java b/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEntityConstants.java similarity index 98% rename from polaris-core/src/main/java/io/polaris/core/entity/PolarisEntityConstants.java rename to polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEntityConstants.java index 35f5be0ff4..5addde088e 100644 --- a/polaris-core/src/main/java/io/polaris/core/entity/PolarisEntityConstants.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEntityConstants.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.entity; +package org.apache.polaris.core.entity; public class PolarisEntityConstants { diff --git a/polaris-core/src/main/java/io/polaris/core/entity/PolarisEntityCore.java b/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEntityCore.java similarity index 99% rename from polaris-core/src/main/java/io/polaris/core/entity/PolarisEntityCore.java rename to polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEntityCore.java index 618e3f5d44..f9d3d133f6 100644 --- a/polaris-core/src/main/java/io/polaris/core/entity/PolarisEntityCore.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEntityCore.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.entity; +package org.apache.polaris.core.entity; import com.fasterxml.jackson.annotation.JsonIgnore; import java.util.Objects; diff --git a/polaris-core/src/main/java/io/polaris/core/entity/PolarisEntityId.java b/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEntityId.java similarity index 98% rename from polaris-core/src/main/java/io/polaris/core/entity/PolarisEntityId.java rename to polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEntityId.java index 2e99d6fad7..4e865268ec 100644 --- a/polaris-core/src/main/java/io/polaris/core/entity/PolarisEntityId.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEntityId.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.entity; +package org.apache.polaris.core.entity; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/polaris-core/src/main/java/io/polaris/core/entity/PolarisEntitySubType.java b/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEntitySubType.java similarity index 98% rename from polaris-core/src/main/java/io/polaris/core/entity/PolarisEntitySubType.java rename to polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEntitySubType.java index e580d1e5d1..05d937d1e0 100644 --- a/polaris-core/src/main/java/io/polaris/core/entity/PolarisEntitySubType.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEntitySubType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.entity; +package org.apache.polaris.core.entity; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/polaris-core/src/main/java/io/polaris/core/entity/PolarisEntityType.java b/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEntityType.java similarity index 99% rename from polaris-core/src/main/java/io/polaris/core/entity/PolarisEntityType.java rename to polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEntityType.java index b56a6a7c25..fa3a2d6618 100644 --- a/polaris-core/src/main/java/io/polaris/core/entity/PolarisEntityType.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisEntityType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.entity; +package org.apache.polaris.core.entity; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/polaris-core/src/main/java/io/polaris/core/entity/PolarisGrantRecord.java b/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisGrantRecord.java similarity index 99% rename from polaris-core/src/main/java/io/polaris/core/entity/PolarisGrantRecord.java rename to polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisGrantRecord.java index 74586c3849..5662f5ca7b 100644 --- a/polaris-core/src/main/java/io/polaris/core/entity/PolarisGrantRecord.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisGrantRecord.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.entity; +package org.apache.polaris.core.entity; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/polaris-core/src/main/java/io/polaris/core/entity/PolarisPrincipalSecrets.java b/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisPrincipalSecrets.java similarity index 98% rename from polaris-core/src/main/java/io/polaris/core/entity/PolarisPrincipalSecrets.java rename to polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisPrincipalSecrets.java index 469af9555b..195c668f6e 100644 --- a/polaris-core/src/main/java/io/polaris/core/entity/PolarisPrincipalSecrets.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisPrincipalSecrets.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.entity; +package org.apache.polaris.core.entity; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/polaris-core/src/main/java/io/polaris/core/entity/PolarisPrivilege.java b/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisPrivilege.java similarity index 99% rename from polaris-core/src/main/java/io/polaris/core/entity/PolarisPrivilege.java rename to polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisPrivilege.java index f3fb78e3de..5148e42ad8 100644 --- a/polaris-core/src/main/java/io/polaris/core/entity/PolarisPrivilege.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisPrivilege.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.entity; +package org.apache.polaris.core.entity; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/polaris-core/src/main/java/io/polaris/core/entity/PolarisTaskConstants.java b/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisTaskConstants.java similarity index 97% rename from polaris-core/src/main/java/io/polaris/core/entity/PolarisTaskConstants.java rename to polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisTaskConstants.java index 995a3c10ad..006fe5b7a5 100644 --- a/polaris-core/src/main/java/io/polaris/core/entity/PolarisTaskConstants.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/entity/PolarisTaskConstants.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.entity; +package org.apache.polaris.core.entity; /** Constants used to store task properties and configuration parameters */ public class PolarisTaskConstants { diff --git a/polaris-core/src/main/java/io/polaris/core/entity/PrincipalEntity.java b/polaris-core/src/main/java/org/apache/polaris/core/entity/PrincipalEntity.java similarity index 96% rename from polaris-core/src/main/java/io/polaris/core/entity/PrincipalEntity.java rename to polaris-core/src/main/java/org/apache/polaris/core/entity/PrincipalEntity.java index 2c2ed175e8..ba0cfe3f53 100644 --- a/polaris-core/src/main/java/io/polaris/core/entity/PrincipalEntity.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/entity/PrincipalEntity.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.entity; +package org.apache.polaris.core.entity; -import io.polaris.core.admin.model.Principal; +import org.apache.polaris.core.admin.model.Principal; /** Wrapper for translating between the REST Principal object and the base PolarisEntity type. */ public class PrincipalEntity extends PolarisEntity { diff --git a/polaris-core/src/main/java/io/polaris/core/entity/PrincipalRoleEntity.java b/polaris-core/src/main/java/org/apache/polaris/core/entity/PrincipalRoleEntity.java similarity index 95% rename from polaris-core/src/main/java/io/polaris/core/entity/PrincipalRoleEntity.java rename to polaris-core/src/main/java/org/apache/polaris/core/entity/PrincipalRoleEntity.java index 6005c43174..26f13cc8f2 100644 --- a/polaris-core/src/main/java/io/polaris/core/entity/PrincipalRoleEntity.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/entity/PrincipalRoleEntity.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.entity; +package org.apache.polaris.core.entity; -import io.polaris.core.admin.model.PrincipalRole; +import org.apache.polaris.core.admin.model.PrincipalRole; /** * Wrapper for translating between the REST PrincipalRole object and the base PolarisEntity type. diff --git a/polaris-core/src/main/java/io/polaris/core/entity/TableLikeEntity.java b/polaris-core/src/main/java/org/apache/polaris/core/entity/TableLikeEntity.java similarity index 98% rename from polaris-core/src/main/java/io/polaris/core/entity/TableLikeEntity.java rename to polaris-core/src/main/java/org/apache/polaris/core/entity/TableLikeEntity.java index 5b68f3d1e2..b5ce9bb4f2 100644 --- a/polaris-core/src/main/java/io/polaris/core/entity/TableLikeEntity.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/entity/TableLikeEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.entity; +package org.apache.polaris.core.entity; import com.fasterxml.jackson.annotation.JsonIgnore; import org.apache.iceberg.catalog.Namespace; diff --git a/polaris-core/src/main/java/io/polaris/core/entity/TaskEntity.java b/polaris-core/src/main/java/org/apache/polaris/core/entity/TaskEntity.java similarity index 94% rename from polaris-core/src/main/java/io/polaris/core/entity/TaskEntity.java rename to polaris-core/src/main/java/org/apache/polaris/core/entity/TaskEntity.java index 15ff95ab4b..5a0add8d4a 100644 --- a/polaris-core/src/main/java/io/polaris/core/entity/TaskEntity.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/entity/TaskEntity.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.entity; +package org.apache.polaris.core.entity; -import io.polaris.core.PolarisCallContext; -import io.polaris.core.context.CallContext; -import io.polaris.core.persistence.PolarisObjectMapperUtil; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.persistence.PolarisObjectMapperUtil; /** * Represents an asynchronous task entity in the persistence layer. A task executor is responsible diff --git a/polaris-core/src/main/java/io/polaris/core/monitor/PolarisMetricRegistry.java b/polaris-core/src/main/java/org/apache/polaris/core/monitor/PolarisMetricRegistry.java similarity index 98% rename from polaris-core/src/main/java/io/polaris/core/monitor/PolarisMetricRegistry.java rename to polaris-core/src/main/java/org/apache/polaris/core/monitor/PolarisMetricRegistry.java index cebb57922c..6c70395e71 100644 --- a/polaris-core/src/main/java/io/polaris/core/monitor/PolarisMetricRegistry.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/monitor/PolarisMetricRegistry.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.monitor; +package org.apache.polaris.core.monitor; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Timer; -import io.polaris.core.resource.TimedApi; import java.lang.reflect.Method; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; +import org.apache.polaris.core.resource.TimedApi; /** * Wrapper around the Micrometer {@link MeterRegistry} providing additional metric management diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/LocalPolarisMetaStoreManagerFactory.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/LocalPolarisMetaStoreManagerFactory.java similarity index 92% rename from polaris-core/src/main/java/io/polaris/core/persistence/LocalPolarisMetaStoreManagerFactory.java rename to polaris-core/src/main/java/org/apache/polaris/core/persistence/LocalPolarisMetaStoreManagerFactory.java index 3b88dfbd5a..4453e4f14d 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/LocalPolarisMetaStoreManagerFactory.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/LocalPolarisMetaStoreManagerFactory.java @@ -16,25 +16,25 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence; - -import io.polaris.core.PolarisCallContext; -import io.polaris.core.PolarisDefaultDiagServiceImpl; -import io.polaris.core.PolarisDiagnostics; -import io.polaris.core.context.CallContext; -import io.polaris.core.context.RealmContext; -import io.polaris.core.entity.PolarisEntity; -import io.polaris.core.entity.PolarisEntityConstants; -import io.polaris.core.entity.PolarisEntitySubType; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.entity.PolarisPrincipalSecrets; -import io.polaris.core.monitor.PolarisMetricRegistry; -import io.polaris.core.storage.PolarisStorageIntegrationProvider; -import io.polaris.core.storage.cache.StorageCredentialCache; +package org.apache.polaris.core.persistence; + import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.function.Supplier; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.PolarisDefaultDiagServiceImpl; +import org.apache.polaris.core.PolarisDiagnostics; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.context.RealmContext; +import org.apache.polaris.core.entity.PolarisEntity; +import org.apache.polaris.core.entity.PolarisEntityConstants; +import org.apache.polaris.core.entity.PolarisEntitySubType; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.entity.PolarisPrincipalSecrets; +import org.apache.polaris.core.monitor.PolarisMetricRegistry; +import org.apache.polaris.core.storage.PolarisStorageIntegrationProvider; +import org.apache.polaris.core.storage.cache.StorageCredentialCache; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/MetaStoreManagerFactory.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/MetaStoreManagerFactory.java similarity index 86% rename from polaris-core/src/main/java/io/polaris/core/persistence/MetaStoreManagerFactory.java rename to polaris-core/src/main/java/org/apache/polaris/core/persistence/MetaStoreManagerFactory.java index ebf1c0f899..643294dc83 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/MetaStoreManagerFactory.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/MetaStoreManagerFactory.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence; +package org.apache.polaris.core.persistence; import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.dropwizard.jackson.Discoverable; -import io.polaris.core.context.RealmContext; -import io.polaris.core.monitor.PolarisMetricRegistry; -import io.polaris.core.storage.PolarisStorageIntegrationProvider; -import io.polaris.core.storage.cache.StorageCredentialCache; import java.util.List; import java.util.Map; import java.util.function.Supplier; +import org.apache.polaris.core.context.RealmContext; +import org.apache.polaris.core.monitor.PolarisMetricRegistry; +import org.apache.polaris.core.storage.PolarisStorageIntegrationProvider; +import org.apache.polaris.core.storage.cache.StorageCredentialCache; /** * Configuration interface for configuring the {@link PolarisMetaStoreManager} via Dropwizard diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/PolarisEntityManager.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisEntityManager.java similarity index 87% rename from polaris-core/src/main/java/io/polaris/core/persistence/PolarisEntityManager.java rename to polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisEntityManager.java index 800ad3fcda..d4ec21b6a5 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/PolarisEntityManager.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisEntityManager.java @@ -16,22 +16,22 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence; +package org.apache.polaris.core.persistence; -import io.polaris.core.auth.AuthenticatedPolarisPrincipal; -import io.polaris.core.context.CallContext; -import io.polaris.core.entity.PolarisEntity; -import io.polaris.core.entity.PolarisEntityConstants; -import io.polaris.core.entity.PolarisEntitySubType; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.entity.PolarisGrantRecord; -import io.polaris.core.entity.PolarisPrivilege; -import io.polaris.core.persistence.cache.EntityCache; -import io.polaris.core.persistence.resolver.PolarisResolutionManifest; -import io.polaris.core.persistence.resolver.Resolver; -import io.polaris.core.storage.cache.StorageCredentialCache; import java.util.List; import java.util.function.Supplier; +import org.apache.polaris.core.auth.AuthenticatedPolarisPrincipal; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.entity.PolarisEntity; +import org.apache.polaris.core.entity.PolarisEntityConstants; +import org.apache.polaris.core.entity.PolarisEntitySubType; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.entity.PolarisGrantRecord; +import org.apache.polaris.core.entity.PolarisPrivilege; +import org.apache.polaris.core.persistence.cache.EntityCache; +import org.apache.polaris.core.persistence.resolver.PolarisResolutionManifest; +import org.apache.polaris.core.persistence.resolver.Resolver; +import org.apache.polaris.core.storage.cache.StorageCredentialCache; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/PolarisEntityResolver.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisEntityResolver.java similarity index 95% rename from polaris-core/src/main/java/io/polaris/core/persistence/PolarisEntityResolver.java rename to polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisEntityResolver.java index fe826956e6..6c85c169db 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/PolarisEntityResolver.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisEntityResolver.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence; +package org.apache.polaris.core.persistence; -import io.polaris.core.PolarisCallContext; -import io.polaris.core.PolarisDiagnostics; -import io.polaris.core.entity.PolarisBaseEntity; -import io.polaris.core.entity.PolarisEntitiesActiveKey; -import io.polaris.core.entity.PolarisEntityActiveRecord; -import io.polaris.core.entity.PolarisEntityConstants; -import io.polaris.core.entity.PolarisEntityCore; -import io.polaris.core.entity.PolarisEntityType; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.stream.Collectors; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.PolarisDiagnostics; +import org.apache.polaris.core.entity.PolarisBaseEntity; +import org.apache.polaris.core.entity.PolarisEntitiesActiveKey; +import org.apache.polaris.core.entity.PolarisEntityActiveRecord; +import org.apache.polaris.core.entity.PolarisEntityConstants; +import org.apache.polaris.core.entity.PolarisEntityCore; +import org.apache.polaris.core.entity.PolarisEntityType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/PolarisMetaStoreManager.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisMetaStoreManager.java similarity index 98% rename from polaris-core/src/main/java/io/polaris/core/persistence/PolarisMetaStoreManager.java rename to polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisMetaStoreManager.java index 3eca5c52b0..a0df197117 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/PolarisMetaStoreManager.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisMetaStoreManager.java @@ -16,30 +16,30 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence; +package org.apache.polaris.core.persistence; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import io.polaris.core.PolarisCallContext; -import io.polaris.core.entity.PolarisBaseEntity; -import io.polaris.core.entity.PolarisChangeTrackingVersions; -import io.polaris.core.entity.PolarisEntity; -import io.polaris.core.entity.PolarisEntityActiveRecord; -import io.polaris.core.entity.PolarisEntityCore; -import io.polaris.core.entity.PolarisEntityId; -import io.polaris.core.entity.PolarisEntitySubType; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.entity.PolarisGrantRecord; -import io.polaris.core.entity.PolarisPrincipalSecrets; -import io.polaris.core.entity.PolarisPrivilege; -import io.polaris.core.storage.PolarisCredentialProperty; -import io.polaris.core.storage.PolarisStorageActions; import java.util.EnumMap; import java.util.List; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.entity.PolarisBaseEntity; +import org.apache.polaris.core.entity.PolarisChangeTrackingVersions; +import org.apache.polaris.core.entity.PolarisEntity; +import org.apache.polaris.core.entity.PolarisEntityActiveRecord; +import org.apache.polaris.core.entity.PolarisEntityCore; +import org.apache.polaris.core.entity.PolarisEntityId; +import org.apache.polaris.core.entity.PolarisEntitySubType; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.entity.PolarisGrantRecord; +import org.apache.polaris.core.entity.PolarisPrincipalSecrets; +import org.apache.polaris.core.entity.PolarisPrivilege; +import org.apache.polaris.core.storage.PolarisCredentialProperty; +import org.apache.polaris.core.storage.PolarisStorageActions; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/PolarisMetaStoreManagerImpl.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisMetaStoreManagerImpl.java similarity index 98% rename from polaris-core/src/main/java/io/polaris/core/persistence/PolarisMetaStoreManagerImpl.java rename to polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisMetaStoreManagerImpl.java index 28e0cb2826..10396aba01 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/PolarisMetaStoreManagerImpl.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisMetaStoreManagerImpl.java @@ -16,33 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence; +package org.apache.polaris.core.persistence; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import io.polaris.core.PolarisCallContext; -import io.polaris.core.entity.AsyncTaskType; -import io.polaris.core.entity.PolarisBaseEntity; -import io.polaris.core.entity.PolarisChangeTrackingVersions; -import io.polaris.core.entity.PolarisEntitiesActiveKey; -import io.polaris.core.entity.PolarisEntity; -import io.polaris.core.entity.PolarisEntityActiveRecord; -import io.polaris.core.entity.PolarisEntityConstants; -import io.polaris.core.entity.PolarisEntityCore; -import io.polaris.core.entity.PolarisEntityId; -import io.polaris.core.entity.PolarisEntitySubType; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.entity.PolarisGrantRecord; -import io.polaris.core.entity.PolarisPrincipalSecrets; -import io.polaris.core.entity.PolarisPrivilege; -import io.polaris.core.entity.PolarisTaskConstants; -import io.polaris.core.storage.PolarisCredentialProperty; -import io.polaris.core.storage.PolarisStorageActions; -import io.polaris.core.storage.PolarisStorageConfigurationInfo; -import io.polaris.core.storage.PolarisStorageIntegration; import java.util.ArrayList; import java.util.EnumMap; import java.util.HashMap; @@ -53,6 +33,26 @@ import java.util.Set; import java.util.function.Function; import java.util.stream.Collectors; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.entity.AsyncTaskType; +import org.apache.polaris.core.entity.PolarisBaseEntity; +import org.apache.polaris.core.entity.PolarisChangeTrackingVersions; +import org.apache.polaris.core.entity.PolarisEntitiesActiveKey; +import org.apache.polaris.core.entity.PolarisEntity; +import org.apache.polaris.core.entity.PolarisEntityActiveRecord; +import org.apache.polaris.core.entity.PolarisEntityConstants; +import org.apache.polaris.core.entity.PolarisEntityCore; +import org.apache.polaris.core.entity.PolarisEntityId; +import org.apache.polaris.core.entity.PolarisEntitySubType; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.entity.PolarisGrantRecord; +import org.apache.polaris.core.entity.PolarisPrincipalSecrets; +import org.apache.polaris.core.entity.PolarisPrivilege; +import org.apache.polaris.core.entity.PolarisTaskConstants; +import org.apache.polaris.core.storage.PolarisCredentialProperty; +import org.apache.polaris.core.storage.PolarisStorageActions; +import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo; +import org.apache.polaris.core.storage.PolarisStorageIntegration; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/PolarisMetaStoreSession.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisMetaStoreSession.java similarity index 96% rename from polaris-core/src/main/java/io/polaris/core/persistence/PolarisMetaStoreSession.java rename to polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisMetaStoreSession.java index 6c6cdbf500..ff5bcbf3e7 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/PolarisMetaStoreSession.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisMetaStoreSession.java @@ -16,24 +16,24 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence; - -import io.polaris.core.PolarisCallContext; -import io.polaris.core.entity.PolarisBaseEntity; -import io.polaris.core.entity.PolarisChangeTrackingVersions; -import io.polaris.core.entity.PolarisEntitiesActiveKey; -import io.polaris.core.entity.PolarisEntityActiveRecord; -import io.polaris.core.entity.PolarisEntityCore; -import io.polaris.core.entity.PolarisEntityId; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.entity.PolarisGrantRecord; -import io.polaris.core.entity.PolarisPrincipalSecrets; -import io.polaris.core.storage.PolarisStorageConfigurationInfo; -import io.polaris.core.storage.PolarisStorageIntegration; +package org.apache.polaris.core.persistence; + import java.util.List; import java.util.function.Function; import java.util.function.Predicate; import java.util.function.Supplier; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.entity.PolarisBaseEntity; +import org.apache.polaris.core.entity.PolarisChangeTrackingVersions; +import org.apache.polaris.core.entity.PolarisEntitiesActiveKey; +import org.apache.polaris.core.entity.PolarisEntityActiveRecord; +import org.apache.polaris.core.entity.PolarisEntityCore; +import org.apache.polaris.core.entity.PolarisEntityId; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.entity.PolarisGrantRecord; +import org.apache.polaris.core.entity.PolarisPrincipalSecrets; +import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo; +import org.apache.polaris.core.storage.PolarisStorageIntegration; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/PolarisObjectMapperUtil.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisObjectMapperUtil.java similarity index 96% rename from polaris-core/src/main/java/io/polaris/core/persistence/PolarisObjectMapperUtil.java rename to polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisObjectMapperUtil.java index 97db450330..b4c0aff597 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/PolarisObjectMapperUtil.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisObjectMapperUtil.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence; +package org.apache.polaris.core.persistence; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; @@ -26,12 +26,12 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; -import io.polaris.core.PolarisCallContext; -import io.polaris.core.entity.PolarisBaseEntity; -import io.polaris.core.entity.PolarisTaskConstants; import java.io.IOException; import java.util.Map; import org.apache.iceberg.rest.RESTSerializers; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.entity.PolarisBaseEntity; +import org.apache.polaris.core.entity.PolarisTaskConstants; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/PolarisResolvedPathWrapper.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisResolvedPathWrapper.java similarity index 96% rename from polaris-core/src/main/java/io/polaris/core/persistence/PolarisResolvedPathWrapper.java rename to polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisResolvedPathWrapper.java index c83e6b8bb9..6b09598c45 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/PolarisResolvedPathWrapper.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisResolvedPathWrapper.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence; +package org.apache.polaris.core.persistence; -import io.polaris.core.entity.PolarisEntity; import java.util.List; import java.util.stream.Collectors; +import org.apache.polaris.core.entity.PolarisEntity; /** * Holds fully-resolved path of PolarisEntities representing the targetEntity with all its grants diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/PolarisTreeMapMetaStoreSessionImpl.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisTreeMapMetaStoreSessionImpl.java similarity index 95% rename from polaris-core/src/main/java/io/polaris/core/persistence/PolarisTreeMapMetaStoreSessionImpl.java rename to polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisTreeMapMetaStoreSessionImpl.java index 21034cffc7..096bce49eb 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/PolarisTreeMapMetaStoreSessionImpl.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisTreeMapMetaStoreSessionImpl.java @@ -16,27 +16,27 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence; +package org.apache.polaris.core.persistence; import com.google.common.base.Predicates; -import io.polaris.core.PolarisCallContext; -import io.polaris.core.entity.PolarisBaseEntity; -import io.polaris.core.entity.PolarisChangeTrackingVersions; -import io.polaris.core.entity.PolarisEntitiesActiveKey; -import io.polaris.core.entity.PolarisEntityActiveRecord; -import io.polaris.core.entity.PolarisEntityCore; -import io.polaris.core.entity.PolarisEntityId; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.entity.PolarisGrantRecord; -import io.polaris.core.entity.PolarisPrincipalSecrets; -import io.polaris.core.storage.PolarisStorageConfigurationInfo; -import io.polaris.core.storage.PolarisStorageIntegration; -import io.polaris.core.storage.PolarisStorageIntegrationProvider; import java.util.List; import java.util.function.Function; import java.util.function.Predicate; import java.util.function.Supplier; import java.util.stream.Collectors; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.entity.PolarisBaseEntity; +import org.apache.polaris.core.entity.PolarisChangeTrackingVersions; +import org.apache.polaris.core.entity.PolarisEntitiesActiveKey; +import org.apache.polaris.core.entity.PolarisEntityActiveRecord; +import org.apache.polaris.core.entity.PolarisEntityCore; +import org.apache.polaris.core.entity.PolarisEntityId; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.entity.PolarisGrantRecord; +import org.apache.polaris.core.entity.PolarisPrincipalSecrets; +import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo; +import org.apache.polaris.core.storage.PolarisStorageIntegration; +import org.apache.polaris.core.storage.PolarisStorageIntegrationProvider; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/PolarisTreeMapStore.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisTreeMapStore.java similarity index 97% rename from polaris-core/src/main/java/io/polaris/core/persistence/PolarisTreeMapStore.java rename to polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisTreeMapStore.java index 0fc0e448f9..44bcc9c17f 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/PolarisTreeMapStore.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisTreeMapStore.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence; - -import io.polaris.core.PolarisCallContext; -import io.polaris.core.PolarisDiagnostics; -import io.polaris.core.entity.PolarisBaseEntity; -import io.polaris.core.entity.PolarisEntityCore; -import io.polaris.core.entity.PolarisGrantRecord; -import io.polaris.core.entity.PolarisPrincipalSecrets; +package org.apache.polaris.core.persistence; + import java.util.ArrayList; import java.util.List; import java.util.TreeMap; import java.util.concurrent.atomic.AtomicLong; import java.util.function.Function; import java.util.function.Supplier; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.PolarisDiagnostics; +import org.apache.polaris.core.entity.PolarisBaseEntity; +import org.apache.polaris.core.entity.PolarisEntityCore; +import org.apache.polaris.core.entity.PolarisGrantRecord; +import org.apache.polaris.core.entity.PolarisPrincipalSecrets; import org.jetbrains.annotations.NotNull; /** Implements a simple in-memory store for Polaris, using tree-map */ diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/ResolvedPolarisEntity.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/ResolvedPolarisEntity.java similarity index 92% rename from polaris-core/src/main/java/io/polaris/core/persistence/ResolvedPolarisEntity.java rename to polaris-core/src/main/java/org/apache/polaris/core/persistence/ResolvedPolarisEntity.java index c27e6a320f..6d59e9aa57 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/ResolvedPolarisEntity.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/ResolvedPolarisEntity.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence; +package org.apache.polaris.core.persistence; import com.google.common.collect.ImmutableList; -import io.polaris.core.entity.PolarisEntity; -import io.polaris.core.entity.PolarisGrantRecord; -import io.polaris.core.persistence.cache.EntityCacheEntry; import java.util.List; +import org.apache.polaris.core.entity.PolarisEntity; +import org.apache.polaris.core.entity.PolarisGrantRecord; +import org.apache.polaris.core.persistence.cache.EntityCacheEntry; import org.jetbrains.annotations.NotNull; public class ResolvedPolarisEntity { diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/RetryOnConcurrencyException.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/RetryOnConcurrencyException.java similarity index 96% rename from polaris-core/src/main/java/io/polaris/core/persistence/RetryOnConcurrencyException.java rename to polaris-core/src/main/java/org/apache/polaris/core/persistence/RetryOnConcurrencyException.java index 40c4c72def..ee69f92209 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/RetryOnConcurrencyException.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/RetryOnConcurrencyException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence; +package org.apache.polaris.core.persistence; import com.google.errorprone.annotations.FormatMethod; diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/cache/EntityCache.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/cache/EntityCache.java similarity index 98% rename from polaris-core/src/main/java/io/polaris/core/persistence/cache/EntityCache.java rename to polaris-core/src/main/java/org/apache/polaris/core/persistence/cache/EntityCache.java index 98df7b4498..3c34b3a992 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/cache/EntityCache.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/cache/EntityCache.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence.cache; +package org.apache.polaris.core.persistence.cache; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.RemovalListener; -import io.polaris.core.PolarisCallContext; -import io.polaris.core.entity.PolarisBaseEntity; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.entity.PolarisGrantRecord; -import io.polaris.core.persistence.PolarisMetaStoreManager; import java.util.AbstractMap; import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.entity.PolarisBaseEntity; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.entity.PolarisGrantRecord; +import org.apache.polaris.core.persistence.PolarisMetaStoreManager; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/cache/EntityCacheByNameKey.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/cache/EntityCacheByNameKey.java similarity index 93% rename from polaris-core/src/main/java/io/polaris/core/persistence/cache/EntityCacheByNameKey.java rename to polaris-core/src/main/java/org/apache/polaris/core/persistence/cache/EntityCacheByNameKey.java index 9ba3bd5d00..dbe89ba486 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/cache/EntityCacheByNameKey.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/cache/EntityCacheByNameKey.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence.cache; +package org.apache.polaris.core.persistence.cache; -import io.polaris.core.entity.PolarisBaseEntity; -import io.polaris.core.entity.PolarisEntityConstants; -import io.polaris.core.entity.PolarisEntityType; import java.util.Objects; +import org.apache.polaris.core.entity.PolarisBaseEntity; +import org.apache.polaris.core.entity.PolarisEntityConstants; +import org.apache.polaris.core.entity.PolarisEntityType; /** Key on the name of an entity */ public class EntityCacheByNameKey { diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/cache/EntityCacheEntry.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/cache/EntityCacheEntry.java similarity index 95% rename from polaris-core/src/main/java/io/polaris/core/persistence/cache/EntityCacheEntry.java rename to polaris-core/src/main/java/org/apache/polaris/core/persistence/cache/EntityCacheEntry.java index 59e8d3bed1..20652b7c94 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/cache/EntityCacheEntry.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/cache/EntityCacheEntry.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence.cache; +package org.apache.polaris.core.persistence.cache; import com.google.common.collect.ImmutableList; -import io.polaris.core.PolarisDiagnostics; -import io.polaris.core.entity.PolarisBaseEntity; -import io.polaris.core.entity.PolarisGrantRecord; import java.util.List; import java.util.stream.Collectors; +import org.apache.polaris.core.PolarisDiagnostics; +import org.apache.polaris.core.entity.PolarisBaseEntity; +import org.apache.polaris.core.entity.PolarisGrantRecord; import org.jetbrains.annotations.NotNull; /** An entry in our entity cache. Note, this is fully immutable */ diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/cache/EntityCacheLookupResult.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/cache/EntityCacheLookupResult.java similarity index 96% rename from polaris-core/src/main/java/io/polaris/core/persistence/cache/EntityCacheLookupResult.java rename to polaris-core/src/main/java/org/apache/polaris/core/persistence/cache/EntityCacheLookupResult.java index f000bc0d4d..87245e38b6 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/cache/EntityCacheLookupResult.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/cache/EntityCacheLookupResult.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence.cache; +package org.apache.polaris.core.persistence.cache; import org.jetbrains.annotations.Nullable; diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/cache/EntityCacheMode.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/cache/EntityCacheMode.java similarity index 95% rename from polaris-core/src/main/java/io/polaris/core/persistence/cache/EntityCacheMode.java rename to polaris-core/src/main/java/org/apache/polaris/core/persistence/cache/EntityCacheMode.java index bbeb3a0663..6dfb79167f 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/cache/EntityCacheMode.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/cache/EntityCacheMode.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence.cache; +package org.apache.polaris.core.persistence.cache; /** Cache mode, the default is ENABLE. */ public enum EntityCacheMode { diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/models/ModelEntity.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/models/ModelEntity.java similarity index 97% rename from polaris-core/src/main/java/io/polaris/core/persistence/models/ModelEntity.java rename to polaris-core/src/main/java/org/apache/polaris/core/persistence/models/ModelEntity.java index e68c21a677..0f2994f665 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/models/ModelEntity.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/models/ModelEntity.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence.models; +package org.apache.polaris.core.persistence.models; -import io.polaris.core.entity.PolarisBaseEntity; -import io.polaris.core.entity.PolarisEntitySubType; -import io.polaris.core.entity.PolarisEntityType; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Table; import jakarta.persistence.Version; +import org.apache.polaris.core.entity.PolarisBaseEntity; +import org.apache.polaris.core.entity.PolarisEntitySubType; +import org.apache.polaris.core.entity.PolarisEntityType; /** * Entity model representing all attributes of a Polaris Entity. This is used to exchange full diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/models/ModelEntityActive.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/models/ModelEntityActive.java similarity index 93% rename from polaris-core/src/main/java/io/polaris/core/persistence/models/ModelEntityActive.java rename to polaris-core/src/main/java/org/apache/polaris/core/persistence/models/ModelEntityActive.java index 9db38a8c8e..dc4bc865c8 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/models/ModelEntityActive.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/models/ModelEntityActive.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence.models; +package org.apache.polaris.core.persistence.models; -import io.polaris.core.entity.PolarisEntityActiveRecord; -import io.polaris.core.entity.PolarisEntitySubType; -import io.polaris.core.entity.PolarisEntityType; import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Table; +import org.apache.polaris.core.entity.PolarisEntityActiveRecord; +import org.apache.polaris.core.entity.PolarisEntitySubType; +import org.apache.polaris.core.entity.PolarisEntityType; /** * EntityActive model representing some attributes of a Polaris Entity. This is used to exchange diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/models/ModelEntityChangeTracking.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/models/ModelEntityChangeTracking.java similarity index 95% rename from polaris-core/src/main/java/io/polaris/core/persistence/models/ModelEntityChangeTracking.java rename to polaris-core/src/main/java/org/apache/polaris/core/persistence/models/ModelEntityChangeTracking.java index 616028bdba..e37f11bff7 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/models/ModelEntityChangeTracking.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/models/ModelEntityChangeTracking.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence.models; +package org.apache.polaris.core.persistence.models; -import io.polaris.core.entity.PolarisBaseEntity; import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Table; import jakarta.persistence.Version; +import org.apache.polaris.core.entity.PolarisBaseEntity; /** * EntityChangeTracking model representing some attributes of a Polaris Entity. This is used to diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/models/ModelEntityDropped.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/models/ModelEntityDropped.java similarity index 97% rename from polaris-core/src/main/java/io/polaris/core/persistence/models/ModelEntityDropped.java rename to polaris-core/src/main/java/org/apache/polaris/core/persistence/models/ModelEntityDropped.java index 6a6e822953..aa62a1f34e 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/models/ModelEntityDropped.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/models/ModelEntityDropped.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence.models; +package org.apache.polaris.core.persistence.models; -import io.polaris.core.entity.PolarisBaseEntity; import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Table; import jakarta.persistence.Version; +import org.apache.polaris.core.entity.PolarisBaseEntity; /** * EntityDropped model representing some attributes of a Polaris Entity. This is used to exchange diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/models/ModelGrantRecord.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/models/ModelGrantRecord.java similarity index 97% rename from polaris-core/src/main/java/io/polaris/core/persistence/models/ModelGrantRecord.java rename to polaris-core/src/main/java/org/apache/polaris/core/persistence/models/ModelGrantRecord.java index b9a1f26442..4419c2cb66 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/models/ModelGrantRecord.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/models/ModelGrantRecord.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence.models; +package org.apache.polaris.core.persistence.models; -import io.polaris.core.entity.PolarisGrantRecord; import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Index; import jakarta.persistence.Table; import jakarta.persistence.Version; +import org.apache.polaris.core.entity.PolarisGrantRecord; /** * GrantRecord model representing a privilege record of a securable granted to grantee. This is used diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/models/ModelPrincipalSecrets.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/models/ModelPrincipalSecrets.java similarity index 97% rename from polaris-core/src/main/java/io/polaris/core/persistence/models/ModelPrincipalSecrets.java rename to polaris-core/src/main/java/org/apache/polaris/core/persistence/models/ModelPrincipalSecrets.java index 7fca415e51..349d54395b 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/models/ModelPrincipalSecrets.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/models/ModelPrincipalSecrets.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence.models; +package org.apache.polaris.core.persistence.models; -import io.polaris.core.entity.PolarisPrincipalSecrets; import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Table; import jakarta.persistence.Version; +import org.apache.polaris.core.entity.PolarisPrincipalSecrets; /** * PrincipalSecrets model representing the secrets used to authenticate a catalog principal. This is diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/models/ModelSequenceId.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/models/ModelSequenceId.java similarity index 96% rename from polaris-core/src/main/java/io/polaris/core/persistence/models/ModelSequenceId.java rename to polaris-core/src/main/java/org/apache/polaris/core/persistence/models/ModelSequenceId.java index 85be375296..8a5e3b7bcd 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/models/ModelSequenceId.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/models/ModelSequenceId.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence.models; +package org.apache.polaris.core.persistence.models; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/resolver/PolarisResolutionManifest.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/PolarisResolutionManifest.java similarity index 95% rename from polaris-core/src/main/java/io/polaris/core/persistence/resolver/PolarisResolutionManifest.java rename to polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/PolarisResolutionManifest.java index f181516777..3dd26be6df 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/resolver/PolarisResolutionManifest.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/PolarisResolutionManifest.java @@ -16,22 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence.resolver; +package org.apache.polaris.core.persistence.resolver; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import io.polaris.core.PolarisDiagnostics; -import io.polaris.core.auth.AuthenticatedPolarisPrincipal; -import io.polaris.core.context.CallContext; -import io.polaris.core.entity.PolarisBaseEntity; -import io.polaris.core.entity.PolarisEntityConstants; -import io.polaris.core.entity.PolarisEntitySubType; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.entity.PrincipalRoleEntity; -import io.polaris.core.persistence.PolarisEntityManager; -import io.polaris.core.persistence.PolarisResolvedPathWrapper; -import io.polaris.core.persistence.ResolvedPolarisEntity; -import io.polaris.core.persistence.cache.EntityCacheEntry; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -39,6 +27,18 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; +import org.apache.polaris.core.PolarisDiagnostics; +import org.apache.polaris.core.auth.AuthenticatedPolarisPrincipal; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.entity.PolarisBaseEntity; +import org.apache.polaris.core.entity.PolarisEntityConstants; +import org.apache.polaris.core.entity.PolarisEntitySubType; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.entity.PrincipalRoleEntity; +import org.apache.polaris.core.persistence.PolarisEntityManager; +import org.apache.polaris.core.persistence.PolarisResolvedPathWrapper; +import org.apache.polaris.core.persistence.ResolvedPolarisEntity; +import org.apache.polaris.core.persistence.cache.EntityCacheEntry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/resolver/PolarisResolutionManifestCatalogView.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/PolarisResolutionManifestCatalogView.java similarity index 88% rename from polaris-core/src/main/java/io/polaris/core/persistence/resolver/PolarisResolutionManifestCatalogView.java rename to polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/PolarisResolutionManifestCatalogView.java index 71392926b2..21e16f5757 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/resolver/PolarisResolutionManifestCatalogView.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/PolarisResolutionManifestCatalogView.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence.resolver; +package org.apache.polaris.core.persistence.resolver; -import io.polaris.core.entity.PolarisEntitySubType; -import io.polaris.core.persistence.PolarisResolvedPathWrapper; +import org.apache.polaris.core.entity.PolarisEntitySubType; +import org.apache.polaris.core.persistence.PolarisResolvedPathWrapper; /** * Defines the methods by which a Catalog is expected to access resolved catalog-path entities, diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/resolver/Resolver.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/Resolver.java similarity index 97% rename from polaris-core/src/main/java/io/polaris/core/persistence/resolver/Resolver.java rename to polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/Resolver.java index db7522c5a2..affdf14bfa 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/resolver/Resolver.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/Resolver.java @@ -16,22 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence.resolver; - -import io.polaris.core.PolarisCallContext; -import io.polaris.core.PolarisDiagnostics; -import io.polaris.core.entity.PolarisBaseEntity; -import io.polaris.core.entity.PolarisChangeTrackingVersions; -import io.polaris.core.entity.PolarisEntityConstants; -import io.polaris.core.entity.PolarisEntityId; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.entity.PolarisGrantRecord; -import io.polaris.core.entity.PolarisPrivilege; -import io.polaris.core.persistence.PolarisMetaStoreManager; -import io.polaris.core.persistence.cache.EntityCache; -import io.polaris.core.persistence.cache.EntityCacheByNameKey; -import io.polaris.core.persistence.cache.EntityCacheEntry; -import io.polaris.core.persistence.cache.EntityCacheLookupResult; +package org.apache.polaris.core.persistence.resolver; + import java.util.AbstractSet; import java.util.ArrayList; import java.util.HashMap; @@ -41,6 +27,20 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.PolarisDiagnostics; +import org.apache.polaris.core.entity.PolarisBaseEntity; +import org.apache.polaris.core.entity.PolarisChangeTrackingVersions; +import org.apache.polaris.core.entity.PolarisEntityConstants; +import org.apache.polaris.core.entity.PolarisEntityId; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.entity.PolarisGrantRecord; +import org.apache.polaris.core.entity.PolarisPrivilege; +import org.apache.polaris.core.persistence.PolarisMetaStoreManager; +import org.apache.polaris.core.persistence.cache.EntityCache; +import org.apache.polaris.core.persistence.cache.EntityCacheByNameKey; +import org.apache.polaris.core.persistence.cache.EntityCacheEntry; +import org.apache.polaris.core.persistence.cache.EntityCacheLookupResult; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/resolver/ResolverEntityName.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/ResolverEntityName.java similarity index 94% rename from polaris-core/src/main/java/io/polaris/core/persistence/resolver/ResolverEntityName.java rename to polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/ResolverEntityName.java index b760224b6d..be5ef8ece3 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/resolver/ResolverEntityName.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/ResolverEntityName.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence.resolver; +package org.apache.polaris.core.persistence.resolver; -import io.polaris.core.entity.PolarisEntityType; import java.util.Objects; +import org.apache.polaris.core.entity.PolarisEntityType; /** Simple class to represent the name of an entity to resolve */ public class ResolverEntityName { diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/resolver/ResolverPath.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/ResolverPath.java similarity index 96% rename from polaris-core/src/main/java/io/polaris/core/persistence/resolver/ResolverPath.java rename to polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/ResolverPath.java index e7ff9553e2..ca349ccaa9 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/resolver/ResolverPath.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/ResolverPath.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence.resolver; +package org.apache.polaris.core.persistence.resolver; import com.google.common.collect.ImmutableList; -import io.polaris.core.entity.PolarisEntityType; import java.util.List; +import org.apache.polaris.core.entity.PolarisEntityType; /** Simple class to represent a path within a catalog */ public class ResolverPath { diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/resolver/ResolverPrincipalRole.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/ResolverPrincipalRole.java similarity index 94% rename from polaris-core/src/main/java/io/polaris/core/persistence/resolver/ResolverPrincipalRole.java rename to polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/ResolverPrincipalRole.java index 09a6a6fa31..88b12ede4d 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/resolver/ResolverPrincipalRole.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/ResolverPrincipalRole.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence.resolver; +package org.apache.polaris.core.persistence.resolver; /** Expected principal type for the principal. Expectation depends on the REST request type */ public enum ResolverPrincipalRole { diff --git a/polaris-core/src/main/java/io/polaris/core/persistence/resolver/ResolverStatus.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/ResolverStatus.java similarity index 96% rename from polaris-core/src/main/java/io/polaris/core/persistence/resolver/ResolverStatus.java rename to polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/ResolverStatus.java index 7e332842ef..49fff120bd 100644 --- a/polaris-core/src/main/java/io/polaris/core/persistence/resolver/ResolverStatus.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/ResolverStatus.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence.resolver; +package org.apache.polaris.core.persistence.resolver; -import io.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.entity.PolarisEntityType; public class ResolverStatus { diff --git a/polaris-core/src/main/java/io/polaris/core/resource/TimedApi.java b/polaris-core/src/main/java/org/apache/polaris/core/resource/TimedApi.java similarity index 86% rename from polaris-core/src/main/java/io/polaris/core/resource/TimedApi.java rename to polaris-core/src/main/java/org/apache/polaris/core/resource/TimedApi.java index cd42c18041..df746de684 100644 --- a/polaris-core/src/main/java/io/polaris/core/resource/TimedApi.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/resource/TimedApi.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.resource; +package org.apache.polaris.core.resource; -import io.polaris.core.monitor.PolarisMetricRegistry; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.apache.polaris.core.monitor.PolarisMetricRegistry; /** * Annotation to specify metrics to be registered on initialization. Users need to explicitly call * {@link PolarisMetricRegistry#init} to register the metrics. * *

If used on a Jersey resource method, this annotation also serves as a marker for {@code - * io.polaris.service.TimedApplicationEventListener} to time the underlying method and count errors - * on failures. + * org.apache.polaris.service.TimedApplicationEventListener} to time the underlying method and count + * errors on failures. */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) diff --git a/polaris-core/src/main/java/io/polaris/core/storage/FileStorageConfigurationInfo.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/FileStorageConfigurationInfo.java similarity index 97% rename from polaris-core/src/main/java/io/polaris/core/storage/FileStorageConfigurationInfo.java rename to polaris-core/src/main/java/org/apache/polaris/core/storage/FileStorageConfigurationInfo.java index 17372b6927..e5e1a31933 100644 --- a/polaris-core/src/main/java/io/polaris/core/storage/FileStorageConfigurationInfo.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/storage/FileStorageConfigurationInfo.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.storage; +package org.apache.polaris.core.storage; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; diff --git a/polaris-core/src/main/java/io/polaris/core/storage/InMemoryStorageIntegration.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/InMemoryStorageIntegration.java similarity index 98% rename from polaris-core/src/main/java/io/polaris/core/storage/InMemoryStorageIntegration.java rename to polaris-core/src/main/java/org/apache/polaris/core/storage/InMemoryStorageIntegration.java index 26ea93d2b5..4197760f9f 100644 --- a/polaris-core/src/main/java/io/polaris/core/storage/InMemoryStorageIntegration.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/storage/InMemoryStorageIntegration.java @@ -16,9 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.storage; +package org.apache.polaris.core.storage; -import io.polaris.core.context.CallContext; import java.util.HashMap; import java.util.Map; import java.util.NavigableSet; @@ -27,6 +26,7 @@ import java.util.TreeSet; import java.util.function.Function; import java.util.stream.Collectors; +import org.apache.polaris.core.context.CallContext; import org.jetbrains.annotations.NotNull; /** diff --git a/polaris-core/src/main/java/io/polaris/core/storage/PolarisCredentialProperty.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/PolarisCredentialProperty.java similarity index 98% rename from polaris-core/src/main/java/io/polaris/core/storage/PolarisCredentialProperty.java rename to polaris-core/src/main/java/org/apache/polaris/core/storage/PolarisCredentialProperty.java index 1b1e912688..3d4eae2bf6 100644 --- a/polaris-core/src/main/java/io/polaris/core/storage/PolarisCredentialProperty.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/storage/PolarisCredentialProperty.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.storage; +package org.apache.polaris.core.storage; /** Enum of polaris supported credential properties */ public enum PolarisCredentialProperty { diff --git a/polaris-core/src/main/java/io/polaris/core/storage/PolarisStorageActions.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/PolarisStorageActions.java similarity index 96% rename from polaris-core/src/main/java/io/polaris/core/storage/PolarisStorageActions.java rename to polaris-core/src/main/java/org/apache/polaris/core/storage/PolarisStorageActions.java index 199f609aaf..6fb49f6fb4 100644 --- a/polaris-core/src/main/java/io/polaris/core/storage/PolarisStorageActions.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/storage/PolarisStorageActions.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.storage; +package org.apache.polaris.core.storage; public enum PolarisStorageActions { READ, diff --git a/polaris-core/src/main/java/io/polaris/core/storage/PolarisStorageConfigurationInfo.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/PolarisStorageConfigurationInfo.java similarity index 93% rename from polaris-core/src/main/java/io/polaris/core/storage/PolarisStorageConfigurationInfo.java rename to polaris-core/src/main/java/org/apache/polaris/core/storage/PolarisStorageConfigurationInfo.java index af85f0ae7e..a169cd555d 100644 --- a/polaris-core/src/main/java/io/polaris/core/storage/PolarisStorageConfigurationInfo.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/storage/PolarisStorageConfigurationInfo.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.storage; +package org.apache.polaris.core.storage; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -25,21 +25,21 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import io.polaris.core.PolarisConfiguration; -import io.polaris.core.PolarisDiagnostics; -import io.polaris.core.admin.model.Catalog; -import io.polaris.core.context.CallContext; -import io.polaris.core.entity.CatalogEntity; -import io.polaris.core.entity.PolarisEntity; -import io.polaris.core.entity.PolarisEntityConstants; -import io.polaris.core.storage.aws.AwsStorageConfigurationInfo; -import io.polaris.core.storage.azure.AzureStorageConfigurationInfo; -import io.polaris.core.storage.gcp.GcpStorageConfigurationInfo; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Locale; import java.util.Optional; +import org.apache.polaris.core.PolarisConfiguration; +import org.apache.polaris.core.PolarisDiagnostics; +import org.apache.polaris.core.admin.model.Catalog; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.entity.CatalogEntity; +import org.apache.polaris.core.entity.PolarisEntity; +import org.apache.polaris.core.entity.PolarisEntityConstants; +import org.apache.polaris.core.storage.aws.AwsStorageConfigurationInfo; +import org.apache.polaris.core.storage.azure.AzureStorageConfigurationInfo; +import org.apache.polaris.core.storage.gcp.GcpStorageConfigurationInfo; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/polaris-core/src/main/java/io/polaris/core/storage/PolarisStorageIntegration.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/PolarisStorageIntegration.java similarity index 98% rename from polaris-core/src/main/java/io/polaris/core/storage/PolarisStorageIntegration.java rename to polaris-core/src/main/java/org/apache/polaris/core/storage/PolarisStorageIntegration.java index 20c1117d10..26554c6fd9 100644 --- a/polaris-core/src/main/java/io/polaris/core/storage/PolarisStorageIntegration.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/storage/PolarisStorageIntegration.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.storage; +package org.apache.polaris.core.storage; -import io.polaris.core.PolarisDiagnostics; import java.util.EnumMap; import java.util.Map; import java.util.Objects; import java.util.Set; +import org.apache.polaris.core.PolarisDiagnostics; import org.jetbrains.annotations.NotNull; /** diff --git a/polaris-core/src/main/java/io/polaris/core/storage/PolarisStorageIntegrationProvider.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/PolarisStorageIntegrationProvider.java similarity index 96% rename from polaris-core/src/main/java/io/polaris/core/storage/PolarisStorageIntegrationProvider.java rename to polaris-core/src/main/java/org/apache/polaris/core/storage/PolarisStorageIntegrationProvider.java index 917eabe953..437d6e3b3a 100644 --- a/polaris-core/src/main/java/io/polaris/core/storage/PolarisStorageIntegrationProvider.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/storage/PolarisStorageIntegrationProvider.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.storage; +package org.apache.polaris.core.storage; import org.jetbrains.annotations.Nullable; diff --git a/polaris-core/src/main/java/io/polaris/core/storage/StorageConfigurationOverride.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/StorageConfigurationOverride.java similarity index 98% rename from polaris-core/src/main/java/io/polaris/core/storage/StorageConfigurationOverride.java rename to polaris-core/src/main/java/org/apache/polaris/core/storage/StorageConfigurationOverride.java index 0c849cecbc..f85ec1eb91 100644 --- a/polaris-core/src/main/java/io/polaris/core/storage/StorageConfigurationOverride.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/storage/StorageConfigurationOverride.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.storage; +package org.apache.polaris.core.storage; import java.util.List; import org.jetbrains.annotations.NotNull; diff --git a/polaris-core/src/main/java/io/polaris/core/storage/StorageUtil.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/StorageUtil.java similarity index 97% rename from polaris-core/src/main/java/io/polaris/core/storage/StorageUtil.java rename to polaris-core/src/main/java/org/apache/polaris/core/storage/StorageUtil.java index 47388a297d..d082ae1b08 100644 --- a/polaris-core/src/main/java/io/polaris/core/storage/StorageUtil.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/storage/StorageUtil.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.storage; +package org.apache.polaris.core.storage; import org.jetbrains.annotations.NotNull; diff --git a/polaris-core/src/main/java/io/polaris/core/storage/aws/AwsCredentialsStorageIntegration.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/aws/AwsCredentialsStorageIntegration.java similarity index 95% rename from polaris-core/src/main/java/io/polaris/core/storage/aws/AwsCredentialsStorageIntegration.java rename to polaris-core/src/main/java/org/apache/polaris/core/storage/aws/AwsCredentialsStorageIntegration.java index 2ef0462955..c2b865f8e9 100644 --- a/polaris-core/src/main/java/io/polaris/core/storage/aws/AwsCredentialsStorageIntegration.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/storage/aws/AwsCredentialsStorageIntegration.java @@ -16,13 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.storage.aws; +package org.apache.polaris.core.storage.aws; -import io.polaris.core.PolarisDiagnostics; -import io.polaris.core.storage.InMemoryStorageIntegration; -import io.polaris.core.storage.PolarisCredentialProperty; -import io.polaris.core.storage.PolarisStorageConfigurationInfo; -import io.polaris.core.storage.StorageUtil; import java.net.URI; import java.util.EnumMap; import java.util.HashMap; @@ -30,6 +25,11 @@ import java.util.Objects; import java.util.Set; import java.util.stream.Stream; +import org.apache.polaris.core.PolarisDiagnostics; +import org.apache.polaris.core.storage.InMemoryStorageIntegration; +import org.apache.polaris.core.storage.PolarisCredentialProperty; +import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo; +import org.apache.polaris.core.storage.StorageUtil; import org.jetbrains.annotations.NotNull; import software.amazon.awssdk.policybuilder.iam.IamConditionOperator; import software.amazon.awssdk.policybuilder.iam.IamEffect; diff --git a/polaris-core/src/main/java/io/polaris/core/storage/aws/AwsStorageConfigurationInfo.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/aws/AwsStorageConfigurationInfo.java similarity index 97% rename from polaris-core/src/main/java/io/polaris/core/storage/aws/AwsStorageConfigurationInfo.java rename to polaris-core/src/main/java/org/apache/polaris/core/storage/aws/AwsStorageConfigurationInfo.java index aaad4a73e2..5bf43c9155 100644 --- a/polaris-core/src/main/java/io/polaris/core/storage/aws/AwsStorageConfigurationInfo.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/storage/aws/AwsStorageConfigurationInfo.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.storage.aws; +package org.apache.polaris.core.storage.aws; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.MoreObjects; -import io.polaris.core.storage.PolarisStorageConfigurationInfo; import java.util.List; import java.util.regex.Pattern; +import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/polaris-core/src/main/java/io/polaris/core/storage/aws/PolarisS3FileIOClientFactory.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/aws/PolarisS3FileIOClientFactory.java similarity index 98% rename from polaris-core/src/main/java/io/polaris/core/storage/aws/PolarisS3FileIOClientFactory.java rename to polaris-core/src/main/java/org/apache/polaris/core/storage/aws/PolarisS3FileIOClientFactory.java index 24d993b6c9..4434741bab 100644 --- a/polaris-core/src/main/java/io/polaris/core/storage/aws/PolarisS3FileIOClientFactory.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/storage/aws/PolarisS3FileIOClientFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.storage.aws; +package org.apache.polaris.core.storage.aws; import java.util.Map; import org.apache.iceberg.aws.AwsClientProperties; diff --git a/polaris-core/src/main/java/io/polaris/core/storage/azure/AzureCredentialsStorageIntegration.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/azure/AzureCredentialsStorageIntegration.java similarity index 97% rename from polaris-core/src/main/java/io/polaris/core/storage/azure/AzureCredentialsStorageIntegration.java rename to polaris-core/src/main/java/org/apache/polaris/core/storage/azure/AzureCredentialsStorageIntegration.java index badf7f3695..ce7ca5b0e9 100644 --- a/polaris-core/src/main/java/io/polaris/core/storage/azure/AzureCredentialsStorageIntegration.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/storage/azure/AzureCredentialsStorageIntegration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.storage.azure; +package org.apache.polaris.core.storage.azure; import com.azure.core.credential.AccessToken; import com.azure.core.credential.TokenRequestContext; @@ -35,10 +35,6 @@ import com.azure.storage.file.datalake.models.DataLakeStorageException; import com.azure.storage.file.datalake.sas.DataLakeServiceSasSignatureValues; import com.azure.storage.file.datalake.sas.PathSasPermission; -import io.polaris.core.PolarisDiagnostics; -import io.polaris.core.storage.InMemoryStorageIntegration; -import io.polaris.core.storage.PolarisCredentialProperty; -import io.polaris.core.storage.PolarisStorageConfigurationInfo; import java.time.Instant; import java.time.OffsetDateTime; import java.time.Period; @@ -48,6 +44,10 @@ import java.util.HashSet; import java.util.Objects; import java.util.Set; +import org.apache.polaris.core.PolarisDiagnostics; +import org.apache.polaris.core.storage.InMemoryStorageIntegration; +import org.apache.polaris.core.storage.PolarisCredentialProperty; +import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/polaris-core/src/main/java/io/polaris/core/storage/azure/AzureLocation.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/azure/AzureLocation.java similarity index 98% rename from polaris-core/src/main/java/io/polaris/core/storage/azure/AzureLocation.java rename to polaris-core/src/main/java/org/apache/polaris/core/storage/azure/AzureLocation.java index e82ef52f4e..6d2401ef7c 100644 --- a/polaris-core/src/main/java/io/polaris/core/storage/azure/AzureLocation.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/storage/azure/AzureLocation.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.storage.azure; +package org.apache.polaris.core.storage.azure; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/polaris-core/src/main/java/io/polaris/core/storage/azure/AzureStorageConfigurationInfo.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/azure/AzureStorageConfigurationInfo.java similarity index 96% rename from polaris-core/src/main/java/io/polaris/core/storage/azure/AzureStorageConfigurationInfo.java rename to polaris-core/src/main/java/org/apache/polaris/core/storage/azure/AzureStorageConfigurationInfo.java index d803a691cb..f284dc64d9 100644 --- a/polaris-core/src/main/java/io/polaris/core/storage/azure/AzureStorageConfigurationInfo.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/storage/azure/AzureStorageConfigurationInfo.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.storage.azure; +package org.apache.polaris.core.storage.azure; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.MoreObjects; -import io.polaris.core.storage.PolarisStorageConfigurationInfo; import java.util.List; import java.util.Objects; +import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/polaris-core/src/main/java/io/polaris/core/storage/cache/StorageCredentialCache.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/cache/StorageCredentialCache.java similarity index 96% rename from polaris-core/src/main/java/io/polaris/core/storage/cache/StorageCredentialCache.java rename to polaris-core/src/main/java/org/apache/polaris/core/storage/cache/StorageCredentialCache.java index a2e65339a0..65e287fb34 100644 --- a/polaris-core/src/main/java/io/polaris/core/storage/cache/StorageCredentialCache.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/storage/cache/StorageCredentialCache.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.storage.cache; +package org.apache.polaris.core.storage.cache; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.Expiry; import com.github.benmanes.caffeine.cache.LoadingCache; -import io.polaris.core.PolarisCallContext; -import io.polaris.core.entity.PolarisEntity; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.persistence.PolarisMetaStoreManager; import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.function.Function; import org.apache.iceberg.exceptions.UnprocessableEntityException; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.entity.PolarisEntity; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.persistence.PolarisMetaStoreManager; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.VisibleForTesting; import org.slf4j.Logger; diff --git a/polaris-core/src/main/java/io/polaris/core/storage/cache/StorageCredentialCacheEntry.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/cache/StorageCredentialCacheEntry.java similarity index 94% rename from polaris-core/src/main/java/io/polaris/core/storage/cache/StorageCredentialCacheEntry.java rename to polaris-core/src/main/java/org/apache/polaris/core/storage/cache/StorageCredentialCacheEntry.java index d6574172d4..4db7b81ab4 100644 --- a/polaris-core/src/main/java/io/polaris/core/storage/cache/StorageCredentialCacheEntry.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/storage/cache/StorageCredentialCacheEntry.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.storage.cache; +package org.apache.polaris.core.storage.cache; -import io.polaris.core.persistence.PolarisMetaStoreManager; -import io.polaris.core.storage.PolarisCredentialProperty; import java.util.EnumMap; import java.util.HashMap; import java.util.Map; +import org.apache.polaris.core.persistence.PolarisMetaStoreManager; +import org.apache.polaris.core.storage.PolarisCredentialProperty; /** A storage credential cached entry. */ public class StorageCredentialCacheEntry { diff --git a/polaris-core/src/main/java/io/polaris/core/storage/cache/StorageCredentialCacheKey.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/cache/StorageCredentialCacheKey.java similarity index 94% rename from polaris-core/src/main/java/io/polaris/core/storage/cache/StorageCredentialCacheKey.java rename to polaris-core/src/main/java/org/apache/polaris/core/storage/cache/StorageCredentialCacheKey.java index e16b9ace31..bbe4d0810a 100644 --- a/polaris-core/src/main/java/io/polaris/core/storage/cache/StorageCredentialCacheKey.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/storage/cache/StorageCredentialCacheKey.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.storage.cache; +package org.apache.polaris.core.storage.cache; -import io.polaris.core.PolarisCallContext; -import io.polaris.core.context.CallContext; -import io.polaris.core.entity.PolarisEntity; -import io.polaris.core.entity.PolarisEntityConstants; import java.util.Objects; import java.util.Set; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.entity.PolarisEntity; +import org.apache.polaris.core.entity.PolarisEntityConstants; import org.jetbrains.annotations.Nullable; public class StorageCredentialCacheKey { diff --git a/polaris-core/src/main/java/io/polaris/core/storage/gcp/GcpCredentialsStorageIntegration.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/gcp/GcpCredentialsStorageIntegration.java similarity index 96% rename from polaris-core/src/main/java/io/polaris/core/storage/gcp/GcpCredentialsStorageIntegration.java rename to polaris-core/src/main/java/org/apache/polaris/core/storage/gcp/GcpCredentialsStorageIntegration.java index 3aad6338bc..32420fb17a 100644 --- a/polaris-core/src/main/java/io/polaris/core/storage/gcp/GcpCredentialsStorageIntegration.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/storage/gcp/GcpCredentialsStorageIntegration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.storage.gcp; +package org.apache.polaris.core.storage.gcp; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -25,11 +25,6 @@ import com.google.auth.oauth2.CredentialAccessBoundary; import com.google.auth.oauth2.DownscopedCredentials; import com.google.auth.oauth2.GoogleCredentials; -import io.polaris.core.PolarisDiagnostics; -import io.polaris.core.storage.InMemoryStorageIntegration; -import io.polaris.core.storage.PolarisCredentialProperty; -import io.polaris.core.storage.PolarisStorageConfigurationInfo; -import io.polaris.core.storage.PolarisStorageIntegration; import java.io.IOException; import java.net.URI; import java.util.ArrayList; @@ -41,6 +36,11 @@ import java.util.Objects; import java.util.Set; import java.util.stream.Stream; +import org.apache.polaris.core.PolarisDiagnostics; +import org.apache.polaris.core.storage.InMemoryStorageIntegration; +import org.apache.polaris.core.storage.PolarisCredentialProperty; +import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo; +import org.apache.polaris.core.storage.PolarisStorageIntegration; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.VisibleForTesting; import org.slf4j.Logger; diff --git a/polaris-core/src/main/java/io/polaris/core/storage/gcp/GcpStorageConfigurationInfo.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/gcp/GcpStorageConfigurationInfo.java similarity index 95% rename from polaris-core/src/main/java/io/polaris/core/storage/gcp/GcpStorageConfigurationInfo.java rename to polaris-core/src/main/java/org/apache/polaris/core/storage/gcp/GcpStorageConfigurationInfo.java index 2cd01959c3..717f15b89f 100644 --- a/polaris-core/src/main/java/io/polaris/core/storage/gcp/GcpStorageConfigurationInfo.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/storage/gcp/GcpStorageConfigurationInfo.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.storage.gcp; +package org.apache.polaris.core.storage.gcp; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.MoreObjects; -import io.polaris.core.storage.PolarisStorageConfigurationInfo; import java.util.List; +import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/polaris-core/src/test/java/io/polaris/core/persistence/EntityCacheTest.java b/polaris-core/src/test/java/org/apache/polaris/core/persistence/EntityCacheTest.java similarity index 96% rename from polaris-core/src/test/java/io/polaris/core/persistence/EntityCacheTest.java rename to polaris-core/src/test/java/org/apache/polaris/core/persistence/EntityCacheTest.java index 8eeb6bd78f..01062f335f 100644 --- a/polaris-core/src/test/java/io/polaris/core/persistence/EntityCacheTest.java +++ b/polaris-core/src/test/java/org/apache/polaris/core/persistence/EntityCacheTest.java @@ -16,22 +16,22 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence; - -import io.polaris.core.PolarisCallContext; -import io.polaris.core.PolarisDefaultDiagServiceImpl; -import io.polaris.core.PolarisDiagnostics; -import io.polaris.core.entity.PolarisBaseEntity; -import io.polaris.core.entity.PolarisEntitySubType; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.entity.PolarisGrantRecord; -import io.polaris.core.entity.PolarisPrivilege; -import io.polaris.core.persistence.cache.EntityCache; -import io.polaris.core.persistence.cache.EntityCacheByNameKey; -import io.polaris.core.persistence.cache.EntityCacheEntry; -import io.polaris.core.persistence.cache.EntityCacheLookupResult; +package org.apache.polaris.core.persistence; + import java.util.List; import java.util.stream.Collectors; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.PolarisDefaultDiagServiceImpl; +import org.apache.polaris.core.PolarisDiagnostics; +import org.apache.polaris.core.entity.PolarisBaseEntity; +import org.apache.polaris.core.entity.PolarisEntitySubType; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.entity.PolarisGrantRecord; +import org.apache.polaris.core.entity.PolarisPrivilege; +import org.apache.polaris.core.persistence.cache.EntityCache; +import org.apache.polaris.core.persistence.cache.EntityCacheByNameKey; +import org.apache.polaris.core.persistence.cache.EntityCacheEntry; +import org.apache.polaris.core.persistence.cache.EntityCacheLookupResult; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/polaris-core/src/test/java/io/polaris/core/persistence/PolarisObjectMapperUtilTest.java b/polaris-core/src/test/java/org/apache/polaris/core/persistence/PolarisObjectMapperUtilTest.java similarity index 93% rename from polaris-core/src/test/java/io/polaris/core/persistence/PolarisObjectMapperUtilTest.java rename to polaris-core/src/test/java/org/apache/polaris/core/persistence/PolarisObjectMapperUtilTest.java index 3bd5dec8be..c22a4ad8ee 100644 --- a/polaris-core/src/test/java/io/polaris/core/persistence/PolarisObjectMapperUtilTest.java +++ b/polaris-core/src/test/java/org/apache/polaris/core/persistence/PolarisObjectMapperUtilTest.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence; +package org.apache.polaris.core.persistence; -import io.polaris.core.entity.PolarisBaseEntity; -import io.polaris.core.entity.PolarisEntitySubType; -import io.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.entity.PolarisBaseEntity; +import org.apache.polaris.core.entity.PolarisEntitySubType; +import org.apache.polaris.core.entity.PolarisEntityType; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/polaris-core/src/test/java/io/polaris/core/persistence/PolarisTreeMapMetaStoreManagerTest.java b/polaris-core/src/test/java/org/apache/polaris/core/persistence/PolarisTreeMapMetaStoreManagerTest.java similarity index 85% rename from polaris-core/src/test/java/io/polaris/core/persistence/PolarisTreeMapMetaStoreManagerTest.java rename to polaris-core/src/test/java/org/apache/polaris/core/persistence/PolarisTreeMapMetaStoreManagerTest.java index 4bceffc28a..23645857b4 100644 --- a/polaris-core/src/test/java/io/polaris/core/persistence/PolarisTreeMapMetaStoreManagerTest.java +++ b/polaris-core/src/test/java/org/apache/polaris/core/persistence/PolarisTreeMapMetaStoreManagerTest.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence; +package org.apache.polaris.core.persistence; -import io.polaris.core.PolarisCallContext; -import io.polaris.core.PolarisConfigurationStore; -import io.polaris.core.PolarisDefaultDiagServiceImpl; -import io.polaris.core.PolarisDiagnostics; import java.time.ZoneId; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.PolarisConfigurationStore; +import org.apache.polaris.core.PolarisDefaultDiagServiceImpl; +import org.apache.polaris.core.PolarisDiagnostics; import org.mockito.Mockito; public class PolarisTreeMapMetaStoreManagerTest extends PolarisMetaStoreManagerTest { diff --git a/polaris-core/src/test/java/io/polaris/core/persistence/ResolverTest.java b/polaris-core/src/test/java/org/apache/polaris/core/persistence/ResolverTest.java similarity index 97% rename from polaris-core/src/test/java/io/polaris/core/persistence/ResolverTest.java rename to polaris-core/src/test/java/org/apache/polaris/core/persistence/ResolverTest.java index 5b858bc289..31369c0692 100644 --- a/polaris-core/src/test/java/io/polaris/core/persistence/ResolverTest.java +++ b/polaris-core/src/test/java/org/apache/polaris/core/persistence/ResolverTest.java @@ -16,28 +16,28 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence; - -import io.polaris.core.PolarisCallContext; -import io.polaris.core.PolarisDefaultDiagServiceImpl; -import io.polaris.core.PolarisDiagnostics; -import io.polaris.core.entity.PolarisBaseEntity; -import io.polaris.core.entity.PolarisEntityCore; -import io.polaris.core.entity.PolarisEntitySubType; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.entity.PolarisGrantRecord; -import io.polaris.core.entity.PolarisPrivilege; -import io.polaris.core.persistence.cache.EntityCache; -import io.polaris.core.persistence.cache.EntityCacheEntry; -import io.polaris.core.persistence.resolver.Resolver; -import io.polaris.core.persistence.resolver.ResolverPath; -import io.polaris.core.persistence.resolver.ResolverStatus; +package org.apache.polaris.core.persistence; + import java.util.ArrayList; import java.util.Comparator; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.PolarisDefaultDiagServiceImpl; +import org.apache.polaris.core.PolarisDiagnostics; +import org.apache.polaris.core.entity.PolarisBaseEntity; +import org.apache.polaris.core.entity.PolarisEntityCore; +import org.apache.polaris.core.entity.PolarisEntitySubType; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.entity.PolarisGrantRecord; +import org.apache.polaris.core.entity.PolarisPrivilege; +import org.apache.polaris.core.persistence.cache.EntityCache; +import org.apache.polaris.core.persistence.cache.EntityCacheEntry; +import org.apache.polaris.core.persistence.resolver.Resolver; +import org.apache.polaris.core.persistence.resolver.ResolverPath; +import org.apache.polaris.core.persistence.resolver.ResolverStatus; import org.assertj.core.api.Assertions; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/polaris-core/src/test/java/io/polaris/core/storage/InMemoryStorageIntegrationTest.java b/polaris-core/src/test/java/org/apache/polaris/core/storage/InMemoryStorageIntegrationTest.java similarity index 95% rename from polaris-core/src/test/java/io/polaris/core/storage/InMemoryStorageIntegrationTest.java rename to polaris-core/src/test/java/org/apache/polaris/core/storage/InMemoryStorageIntegrationTest.java index 74bc25403f..94d523b273 100644 --- a/polaris-core/src/test/java/io/polaris/core/storage/InMemoryStorageIntegrationTest.java +++ b/polaris-core/src/test/java/org/apache/polaris/core/storage/InMemoryStorageIntegrationTest.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.storage; +package org.apache.polaris.core.storage; -import io.polaris.core.PolarisCallContext; -import io.polaris.core.PolarisConfigurationStore; -import io.polaris.core.PolarisDefaultDiagServiceImpl; -import io.polaris.core.PolarisDiagnostics; -import io.polaris.core.context.CallContext; -import io.polaris.core.storage.aws.AwsStorageConfigurationInfo; import java.time.Clock; import java.util.EnumMap; import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.PolarisConfigurationStore; +import org.apache.polaris.core.PolarisDefaultDiagServiceImpl; +import org.apache.polaris.core.PolarisDiagnostics; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.storage.aws.AwsStorageConfigurationInfo; import org.assertj.core.api.Assertions; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/polaris-core/src/test/java/io/polaris/core/storage/cache/StorageCredentialCacheTest.java b/polaris-core/src/test/java/org/apache/polaris/core/storage/cache/StorageCredentialCacheTest.java similarity index 94% rename from polaris-core/src/test/java/io/polaris/core/storage/cache/StorageCredentialCacheTest.java rename to polaris-core/src/test/java/org/apache/polaris/core/storage/cache/StorageCredentialCacheTest.java index 018661a7e8..b54896d175 100644 --- a/polaris-core/src/test/java/io/polaris/core/storage/cache/StorageCredentialCacheTest.java +++ b/polaris-core/src/test/java/org/apache/polaris/core/storage/cache/StorageCredentialCacheTest.java @@ -16,24 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.storage.cache; +package org.apache.polaris.core.storage.cache; import com.google.common.collect.ImmutableMap; -import io.polaris.core.PolarisCallContext; -import io.polaris.core.PolarisDefaultDiagServiceImpl; -import io.polaris.core.PolarisDiagnostics; -import io.polaris.core.entity.PolarisBaseEntity; -import io.polaris.core.entity.PolarisEntity; -import io.polaris.core.entity.PolarisEntityConstants; -import io.polaris.core.entity.PolarisEntitySubType; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.persistence.PolarisMetaStoreManager; -import io.polaris.core.persistence.PolarisMetaStoreManagerImpl; -import io.polaris.core.persistence.PolarisMetaStoreSession; -import io.polaris.core.persistence.PolarisObjectMapperUtil; -import io.polaris.core.persistence.PolarisTreeMapMetaStoreSessionImpl; -import io.polaris.core.persistence.PolarisTreeMapStore; -import io.polaris.core.storage.PolarisCredentialProperty; import java.util.ArrayList; import java.util.Arrays; import java.util.EnumMap; @@ -41,6 +26,21 @@ import java.util.List; import java.util.Map; import org.apache.iceberg.exceptions.UnprocessableEntityException; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.PolarisDefaultDiagServiceImpl; +import org.apache.polaris.core.PolarisDiagnostics; +import org.apache.polaris.core.entity.PolarisBaseEntity; +import org.apache.polaris.core.entity.PolarisEntity; +import org.apache.polaris.core.entity.PolarisEntityConstants; +import org.apache.polaris.core.entity.PolarisEntitySubType; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.persistence.PolarisMetaStoreManager; +import org.apache.polaris.core.persistence.PolarisMetaStoreManagerImpl; +import org.apache.polaris.core.persistence.PolarisMetaStoreSession; +import org.apache.polaris.core.persistence.PolarisObjectMapperUtil; +import org.apache.polaris.core.persistence.PolarisTreeMapMetaStoreSessionImpl; +import org.apache.polaris.core.persistence.PolarisTreeMapStore; +import org.apache.polaris.core.storage.PolarisCredentialProperty; import org.assertj.core.api.Assertions; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.RepeatedTest; diff --git a/polaris-core/src/test/java/io/polaris/service/storage/aws/AwsCredentialsStorageIntegrationTest.java b/polaris-core/src/test/java/org/apache/polaris/service/storage/aws/AwsCredentialsStorageIntegrationTest.java similarity index 98% rename from polaris-core/src/test/java/io/polaris/service/storage/aws/AwsCredentialsStorageIntegrationTest.java rename to polaris-core/src/test/java/org/apache/polaris/service/storage/aws/AwsCredentialsStorageIntegrationTest.java index a8ae680c85..ce44276dfb 100644 --- a/polaris-core/src/test/java/io/polaris/service/storage/aws/AwsCredentialsStorageIntegrationTest.java +++ b/polaris-core/src/test/java/org/apache/polaris/service/storage/aws/AwsCredentialsStorageIntegrationTest.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.storage.aws; +package org.apache.polaris.service.storage.aws; import static org.assertj.core.api.Assertions.assertThat; -import io.polaris.core.PolarisDiagnostics; -import io.polaris.core.storage.PolarisCredentialProperty; -import io.polaris.core.storage.PolarisStorageConfigurationInfo; -import io.polaris.core.storage.aws.AwsCredentialsStorageIntegration; -import io.polaris.core.storage.aws.AwsStorageConfigurationInfo; import java.util.EnumMap; import java.util.List; import java.util.Set; +import org.apache.polaris.core.PolarisDiagnostics; +import org.apache.polaris.core.storage.PolarisCredentialProperty; +import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo; +import org.apache.polaris.core.storage.aws.AwsCredentialsStorageIntegration; +import org.apache.polaris.core.storage.aws.AwsStorageConfigurationInfo; import org.assertj.core.api.InstanceOfAssertFactories; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/polaris-core/src/test/java/io/polaris/service/storage/azure/AzureCredentialStorageIntegrationTest.java b/polaris-core/src/test/java/org/apache/polaris/service/storage/azure/AzureCredentialStorageIntegrationTest.java similarity index 98% rename from polaris-core/src/test/java/io/polaris/service/storage/azure/AzureCredentialStorageIntegrationTest.java rename to polaris-core/src/test/java/org/apache/polaris/service/storage/azure/AzureCredentialStorageIntegrationTest.java index 8741b1892d..a7e9bdfdc7 100644 --- a/polaris-core/src/test/java/io/polaris/service/storage/azure/AzureCredentialStorageIntegrationTest.java +++ b/polaris-core/src/test/java/org/apache/polaris/service/storage/azure/AzureCredentialStorageIntegrationTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.storage.azure; +package org.apache.polaris.service.storage.azure; import com.azure.storage.blob.BlobClient; import com.azure.storage.blob.BlobClientBuilder; @@ -32,10 +32,6 @@ import com.azure.storage.file.datalake.DataLakeFileSystemClientBuilder; import com.azure.storage.file.datalake.models.DataLakeStorageException; import com.azure.storage.file.datalake.models.PathItem; -import io.polaris.core.PolarisDefaultDiagServiceImpl; -import io.polaris.core.storage.PolarisCredentialProperty; -import io.polaris.core.storage.azure.AzureCredentialsStorageIntegration; -import io.polaris.core.storage.azure.AzureStorageConfigurationInfo; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.lang.annotation.ElementType; @@ -51,6 +47,10 @@ import java.util.List; import java.util.Map; import java.util.stream.Stream; +import org.apache.polaris.core.PolarisDefaultDiagServiceImpl; +import org.apache.polaris.core.storage.PolarisCredentialProperty; +import org.apache.polaris.core.storage.azure.AzureCredentialsStorageIntegration; +import org.apache.polaris.core.storage.azure.AzureStorageConfigurationInfo; import org.assertj.core.api.Assertions; import org.assertj.core.util.Strings; import org.junit.jupiter.api.Test; diff --git a/polaris-core/src/test/java/io/polaris/service/storage/azure/AzureLocationTest.java b/polaris-core/src/test/java/org/apache/polaris/service/storage/azure/AzureLocationTest.java similarity index 94% rename from polaris-core/src/test/java/io/polaris/service/storage/azure/AzureLocationTest.java rename to polaris-core/src/test/java/org/apache/polaris/service/storage/azure/AzureLocationTest.java index 02541fc427..f08ae8008f 100644 --- a/polaris-core/src/test/java/io/polaris/service/storage/azure/AzureLocationTest.java +++ b/polaris-core/src/test/java/org/apache/polaris/service/storage/azure/AzureLocationTest.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.storage.azure; +package org.apache.polaris.service.storage.azure; -import io.polaris.core.storage.azure.AzureLocation; +import org.apache.polaris.core.storage.azure.AzureLocation; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/polaris-core/src/test/java/io/polaris/service/storage/gcp/GcpCredentialsStorageIntegrationTest.java b/polaris-core/src/test/java/org/apache/polaris/service/storage/gcp/GcpCredentialsStorageIntegrationTest.java similarity index 97% rename from polaris-core/src/test/java/io/polaris/service/storage/gcp/GcpCredentialsStorageIntegrationTest.java rename to polaris-core/src/test/java/org/apache/polaris/service/storage/gcp/GcpCredentialsStorageIntegrationTest.java index 52b995265a..9a9c9be969 100644 --- a/polaris-core/src/test/java/io/polaris/service/storage/gcp/GcpCredentialsStorageIntegrationTest.java +++ b/polaris-core/src/test/java/org/apache/polaris/service/storage/gcp/GcpCredentialsStorageIntegrationTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.storage.gcp; +package org.apache.polaris.service.storage.gcp; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; @@ -37,10 +37,6 @@ import com.google.cloud.storage.Storage; import com.google.cloud.storage.StorageException; import com.google.cloud.storage.StorageOptions; -import io.polaris.core.PolarisDefaultDiagServiceImpl; -import io.polaris.core.storage.PolarisCredentialProperty; -import io.polaris.core.storage.gcp.GcpCredentialsStorageIntegration; -import io.polaris.core.storage.gcp.GcpStorageConfigurationInfo; import java.io.IOException; import java.time.Instant; import java.time.temporal.ChronoUnit; @@ -52,6 +48,10 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.polaris.core.PolarisDefaultDiagServiceImpl; +import org.apache.polaris.core.storage.PolarisCredentialProperty; +import org.apache.polaris.core.storage.gcp.GcpCredentialsStorageIntegration; +import org.apache.polaris.core.storage.gcp.GcpStorageConfigurationInfo; import org.assertj.core.api.Assertions; import org.assertj.core.api.recursive.comparison.RecursiveComparisonConfiguration; import org.assertj.core.util.Strings; diff --git a/polaris-core/src/test/resources/io/polaris/service/storage/gcp/gcp-testGenerateAccessBoundary.json b/polaris-core/src/test/resources/org/apache/polaris/service/storage/gcp/gcp-testGenerateAccessBoundary.json similarity index 100% rename from polaris-core/src/test/resources/io/polaris/service/storage/gcp/gcp-testGenerateAccessBoundary.json rename to polaris-core/src/test/resources/org/apache/polaris/service/storage/gcp/gcp-testGenerateAccessBoundary.json diff --git a/polaris-core/src/test/resources/io/polaris/service/storage/gcp/gcp-testGenerateAccessBoundaryWithMultipleBuckets.json b/polaris-core/src/test/resources/org/apache/polaris/service/storage/gcp/gcp-testGenerateAccessBoundaryWithMultipleBuckets.json similarity index 100% rename from polaris-core/src/test/resources/io/polaris/service/storage/gcp/gcp-testGenerateAccessBoundaryWithMultipleBuckets.json rename to polaris-core/src/test/resources/org/apache/polaris/service/storage/gcp/gcp-testGenerateAccessBoundaryWithMultipleBuckets.json diff --git a/polaris-core/src/test/resources/io/polaris/service/storage/gcp/gcp-testGenerateAccessBoundaryWithoutList.json b/polaris-core/src/test/resources/org/apache/polaris/service/storage/gcp/gcp-testGenerateAccessBoundaryWithoutList.json similarity index 100% rename from polaris-core/src/test/resources/io/polaris/service/storage/gcp/gcp-testGenerateAccessBoundaryWithoutList.json rename to polaris-core/src/test/resources/org/apache/polaris/service/storage/gcp/gcp-testGenerateAccessBoundaryWithoutList.json diff --git a/polaris-core/src/test/resources/io/polaris/service/storage/gcp/gcp-testGenerateAccessBoundaryWithoutWrites.json b/polaris-core/src/test/resources/org/apache/polaris/service/storage/gcp/gcp-testGenerateAccessBoundaryWithoutWrites.json similarity index 100% rename from polaris-core/src/test/resources/io/polaris/service/storage/gcp/gcp-testGenerateAccessBoundaryWithoutWrites.json rename to polaris-core/src/test/resources/org/apache/polaris/service/storage/gcp/gcp-testGenerateAccessBoundaryWithoutWrites.json diff --git a/polaris-core/src/testFixtures/java/io/polaris/core/persistence/PolarisMetaStoreManagerTest.java b/polaris-core/src/testFixtures/java/org/apache/polaris/core/persistence/PolarisMetaStoreManagerTest.java similarity index 96% rename from polaris-core/src/testFixtures/java/io/polaris/core/persistence/PolarisMetaStoreManagerTest.java rename to polaris-core/src/testFixtures/java/org/apache/polaris/core/persistence/PolarisMetaStoreManagerTest.java index 9e872e64aa..ab26345457 100644 --- a/polaris-core/src/testFixtures/java/io/polaris/core/persistence/PolarisMetaStoreManagerTest.java +++ b/polaris-core/src/testFixtures/java/org/apache/polaris/core/persistence/PolarisMetaStoreManagerTest.java @@ -16,17 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence; - -import io.polaris.core.PolarisCallContext; -import io.polaris.core.context.CallContext; -import io.polaris.core.entity.AsyncTaskType; -import io.polaris.core.entity.PolarisBaseEntity; -import io.polaris.core.entity.PolarisEntity; -import io.polaris.core.entity.PolarisEntityActiveRecord; -import io.polaris.core.entity.PolarisEntitySubType; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.entity.TaskEntity; +package org.apache.polaris.core.persistence; + import java.time.Duration; import java.time.Instant; import java.time.ZoneOffset; @@ -43,6 +34,15 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.entity.AsyncTaskType; +import org.apache.polaris.core.entity.PolarisBaseEntity; +import org.apache.polaris.core.entity.PolarisEntity; +import org.apache.polaris.core.entity.PolarisEntityActiveRecord; +import org.apache.polaris.core.entity.PolarisEntitySubType; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.entity.TaskEntity; import org.assertj.core.api.Assertions; import org.assertj.core.api.InstanceOfAssertFactories; import org.junit.jupiter.api.BeforeEach; diff --git a/polaris-core/src/testFixtures/java/io/polaris/core/persistence/PolarisTestMetaStoreManager.java b/polaris-core/src/testFixtures/java/org/apache/polaris/core/persistence/PolarisTestMetaStoreManager.java similarity index 99% rename from polaris-core/src/testFixtures/java/io/polaris/core/persistence/PolarisTestMetaStoreManager.java rename to polaris-core/src/testFixtures/java/org/apache/polaris/core/persistence/PolarisTestMetaStoreManager.java index 113980a2af..65bc7ba6ee 100644 --- a/polaris-core/src/testFixtures/java/io/polaris/core/persistence/PolarisTestMetaStoreManager.java +++ b/polaris-core/src/testFixtures/java/org/apache/polaris/core/persistence/PolarisTestMetaStoreManager.java @@ -16,31 +16,31 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.core.persistence; +package org.apache.polaris.core.persistence; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import io.polaris.core.PolarisCallContext; -import io.polaris.core.entity.PolarisBaseEntity; -import io.polaris.core.entity.PolarisChangeTrackingVersions; -import io.polaris.core.entity.PolarisEntity; -import io.polaris.core.entity.PolarisEntityActiveRecord; -import io.polaris.core.entity.PolarisEntityConstants; -import io.polaris.core.entity.PolarisEntityCore; -import io.polaris.core.entity.PolarisEntityId; -import io.polaris.core.entity.PolarisEntitySubType; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.entity.PolarisGrantRecord; -import io.polaris.core.entity.PolarisPrincipalSecrets; -import io.polaris.core.entity.PolarisPrivilege; -import io.polaris.core.entity.PolarisTaskConstants; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Map; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.entity.PolarisBaseEntity; +import org.apache.polaris.core.entity.PolarisChangeTrackingVersions; +import org.apache.polaris.core.entity.PolarisEntity; +import org.apache.polaris.core.entity.PolarisEntityActiveRecord; +import org.apache.polaris.core.entity.PolarisEntityConstants; +import org.apache.polaris.core.entity.PolarisEntityCore; +import org.apache.polaris.core.entity.PolarisEntityId; +import org.apache.polaris.core.entity.PolarisEntitySubType; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.entity.PolarisGrantRecord; +import org.apache.polaris.core.entity.PolarisPrincipalSecrets; +import org.apache.polaris.core.entity.PolarisPrivilege; +import org.apache.polaris.core.entity.PolarisTaskConstants; import org.assertj.core.api.Assertions; import org.jetbrains.annotations.NotNull; diff --git a/polaris-server.yml b/polaris-server.yml index de382fa207..08f51ed747 100644 --- a/polaris-server.yml +++ b/polaris-server.yml @@ -102,8 +102,8 @@ oauth2: # secret: polaris authenticator: - class: io.polaris.service.auth.TestInlineBearerTokenPolarisAuthenticator -# class: io.polaris.service.auth.DefaultPolarisAuthenticator # - uncomment to support Auth0 JWT tokens + class: org.apache.polaris.service.auth.TestInlineBearerTokenPolarisAuthenticator +# class: org.apache.polaris.service.auth.DefaultPolarisAuthenticator # - uncomment to support Auth0 JWT tokens # tokenBroker: # type: symmetric-key # secret: polaris @@ -136,7 +136,7 @@ logging: # Logger-specific levels. loggers: org.apache.iceberg.rest: DEBUG - io.polaris: DEBUG + org.apache.polaris: DEBUG appenders: diff --git a/polaris-service/build.gradle.kts b/polaris-service/build.gradle.kts index 6d22934a07..d509ee5f3a 100644 --- a/polaris-service/build.gradle.kts +++ b/polaris-service/build.gradle.kts @@ -118,7 +118,7 @@ openApiGenerate { inputSpec = "$rootDir/spec/rest-catalog-open-api.yaml" generatorName = "jaxrs-resteasy" outputDir = "$projectDir/build/generated" - apiPackage = "io.polaris.service.catalog.api" + apiPackage = "org.apache.polaris.service.catalog.api" ignoreFileOverride = "$rootDir/.openapi-generator-ignore" removeOperationIdPrefix = true templateDir = "$rootDir/server-templates" @@ -164,12 +164,12 @@ openApiGenerate { "OAuthError" to "org.apache.iceberg.rest.responses.ErrorResponse", // Custom types defined below - "CommitViewRequest" to "io.polaris.service.types.CommitViewRequest", - "TokenType" to "io.polaris.service.types.TokenType", - "CommitTableRequest" to "io.polaris.service.types.CommitTableRequest", - "NotificationRequest" to "io.polaris.service.types.NotificationRequest", - "TableUpdateNotification" to "io.polaris.service.types.TableUpdateNotification", - "NotificationType" to "io.polaris.service.types.NotificationType" + "CommitViewRequest" to "org.apache.polaris.service.types.CommitViewRequest", + "TokenType" to "org.apache.polaris.service.types.TokenType", + "CommitTableRequest" to "org.apache.polaris.service.types.CommitTableRequest", + "NotificationRequest" to "org.apache.polaris.service.types.NotificationRequest", + "TableUpdateNotification" to "org.apache.polaris.service.types.TableUpdateNotification", + "NotificationType" to "org.apache.polaris.service.types.NotificationType" ) } @@ -177,8 +177,8 @@ tasks.register("generatePolarisService").configure { inputSpec = "$rootDir/spec/polaris-management-service.yml" generatorName = "jaxrs-resteasy" outputDir = "$projectDir/build/generated" - apiPackage = "io.polaris.service.admin.api" - modelPackage = "io.polaris.core.admin.model" + apiPackage = "org.apache.polaris.service.admin.api" + modelPackage = "org.apache.polaris.core.admin.model" ignoreFileOverride = "$rootDir/.openapi-generator-ignore" removeOperationIdPrefix = true templateDir = "$rootDir/server-templates" @@ -219,18 +219,18 @@ tasks.register("runApp").configure { environment("AWS_REGION", "us-west-2") } classpath = sourceSets["main"].runtimeClasspath - mainClass = "io.polaris.service.PolarisApplication" + mainClass = "org.apache.polaris.service.PolarisApplication" args("server", "$rootDir/polaris-server.yml") } -application { mainClass = "io.polaris.service.PolarisApplication" } +application { mainClass = "org.apache.polaris.service.PolarisApplication" } tasks.named("jar") { - manifest { attributes["Main-Class"] = "io.polaris.service.PolarisApplication" } + manifest { attributes["Main-Class"] = "org.apache.polaris.service.PolarisApplication" } } tasks.named("shadowJar") { - manifest { attributes["Main-Class"] = "io.polaris.service.PolarisApplication" } + manifest { attributes["Main-Class"] = "org.apache.polaris.service.PolarisApplication" } archiveVersion.set("") mergeServiceFiles() isZip64 = true diff --git a/polaris-service/src/main/java/io/polaris/service/BootstrapRealmsCommand.java b/polaris-service/src/main/java/org/apache/polaris/service/BootstrapRealmsCommand.java similarity index 87% rename from polaris-service/src/main/java/io/polaris/service/BootstrapRealmsCommand.java rename to polaris-service/src/main/java/org/apache/polaris/service/BootstrapRealmsCommand.java index 61baff4057..3e7b8fc317 100644 --- a/polaris-service/src/main/java/io/polaris/service/BootstrapRealmsCommand.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/BootstrapRealmsCommand.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service; +package org.apache.polaris.service; import io.dropwizard.core.cli.ConfiguredCommand; import io.dropwizard.core.setup.Bootstrap; -import io.polaris.core.PolarisConfigurationStore; -import io.polaris.core.persistence.MetaStoreManagerFactory; -import io.polaris.core.persistence.PolarisMetaStoreManager; -import io.polaris.service.config.ConfigurationStoreAware; -import io.polaris.service.config.PolarisApplicationConfig; -import io.polaris.service.config.RealmEntityManagerFactory; -import io.polaris.service.context.CallContextResolver; import java.util.Map; import net.sourceforge.argparse4j.inf.Namespace; +import org.apache.polaris.core.PolarisConfigurationStore; +import org.apache.polaris.core.persistence.MetaStoreManagerFactory; +import org.apache.polaris.core.persistence.PolarisMetaStoreManager; +import org.apache.polaris.service.config.ConfigurationStoreAware; +import org.apache.polaris.service.config.PolarisApplicationConfig; +import org.apache.polaris.service.config.RealmEntityManagerFactory; +import org.apache.polaris.service.context.CallContextResolver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/polaris-service/src/main/java/io/polaris/service/IcebergExceptionMapper.java b/polaris-service/src/main/java/org/apache/polaris/service/IcebergExceptionMapper.java similarity index 99% rename from polaris-service/src/main/java/io/polaris/service/IcebergExceptionMapper.java rename to polaris-service/src/main/java/org/apache/polaris/service/IcebergExceptionMapper.java index e465c2a09e..b829a39c1f 100644 --- a/polaris-service/src/main/java/io/polaris/service/IcebergExceptionMapper.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/IcebergExceptionMapper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service; +package org.apache.polaris.service; import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.MediaType; diff --git a/polaris-service/src/main/java/io/polaris/service/IcebergJerseyViolationExceptionMapper.java b/polaris-service/src/main/java/org/apache/polaris/service/IcebergJerseyViolationExceptionMapper.java similarity index 98% rename from polaris-service/src/main/java/io/polaris/service/IcebergJerseyViolationExceptionMapper.java rename to polaris-service/src/main/java/org/apache/polaris/service/IcebergJerseyViolationExceptionMapper.java index bac549a68b..2ffbdbbb28 100644 --- a/polaris-service/src/main/java/io/polaris/service/IcebergJerseyViolationExceptionMapper.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/IcebergJerseyViolationExceptionMapper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service; +package org.apache.polaris.service; import io.dropwizard.jersey.validation.JerseyViolationException; import jakarta.ws.rs.core.MediaType; diff --git a/polaris-service/src/main/java/io/polaris/service/IcebergJsonProcessingExceptionMapper.java b/polaris-service/src/main/java/org/apache/polaris/service/IcebergJsonProcessingExceptionMapper.java similarity index 98% rename from polaris-service/src/main/java/io/polaris/service/IcebergJsonProcessingExceptionMapper.java rename to polaris-service/src/main/java/org/apache/polaris/service/IcebergJsonProcessingExceptionMapper.java index 6f53c745d9..7299200852 100644 --- a/polaris-service/src/main/java/io/polaris/service/IcebergJsonProcessingExceptionMapper.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/IcebergJsonProcessingExceptionMapper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service; +package org.apache.polaris.service; import com.fasterxml.jackson.core.JsonGenerationException; import com.fasterxml.jackson.core.JsonParseException; diff --git a/polaris-service/src/main/java/io/polaris/service/PolarisApplication.java b/polaris-service/src/main/java/org/apache/polaris/service/PolarisApplication.java similarity index 87% rename from polaris-service/src/main/java/io/polaris/service/PolarisApplication.java rename to polaris-service/src/main/java/org/apache/polaris/service/PolarisApplication.java index da38c4af45..544c9f6422 100644 --- a/polaris-service/src/main/java/io/polaris/service/PolarisApplication.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/PolarisApplication.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service; +package org.apache.polaris.service; import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.Objects.requireNonNull; @@ -47,41 +47,6 @@ import io.opentelemetry.sdk.trace.SdkTracerProvider; import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor; import io.opentelemetry.semconv.ServiceAttributes; -import io.polaris.core.PolarisConfigurationStore; -import io.polaris.core.auth.AuthenticatedPolarisPrincipal; -import io.polaris.core.auth.PolarisAuthorizer; -import io.polaris.core.context.CallContext; -import io.polaris.core.context.RealmContext; -import io.polaris.core.monitor.PolarisMetricRegistry; -import io.polaris.core.persistence.MetaStoreManagerFactory; -import io.polaris.service.admin.PolarisServiceImpl; -import io.polaris.service.admin.api.PolarisCatalogsApi; -import io.polaris.service.admin.api.PolarisPrincipalRolesApi; -import io.polaris.service.admin.api.PolarisPrincipalsApi; -import io.polaris.service.auth.DiscoverableAuthenticator; -import io.polaris.service.catalog.IcebergCatalogAdapter; -import io.polaris.service.catalog.api.IcebergRestCatalogApi; -import io.polaris.service.catalog.api.IcebergRestConfigurationApi; -import io.polaris.service.catalog.api.IcebergRestOAuth2Api; -import io.polaris.service.config.ConfigurationStoreAware; -import io.polaris.service.config.HasEntityManagerFactory; -import io.polaris.service.config.OAuth2ApiService; -import io.polaris.service.config.PolarisApplicationConfig; -import io.polaris.service.config.RealmEntityManagerFactory; -import io.polaris.service.config.Serializers; -import io.polaris.service.config.TaskHandlerConfiguration; -import io.polaris.service.context.CallContextCatalogFactory; -import io.polaris.service.context.CallContextResolver; -import io.polaris.service.context.PolarisCallContextCatalogFactory; -import io.polaris.service.context.RealmContextResolver; -import io.polaris.service.persistence.InMemoryPolarisMetaStoreManagerFactory; -import io.polaris.service.storage.PolarisStorageIntegrationProviderImpl; -import io.polaris.service.task.ManifestFileCleanupTaskHandler; -import io.polaris.service.task.TableCleanupTaskHandler; -import io.polaris.service.task.TaskExecutorImpl; -import io.polaris.service.task.TaskFileIOSupplier; -import io.polaris.service.tracing.OpenTelemetryAware; -import io.polaris.service.tracing.TracingFilter; import io.prometheus.metrics.exporter.servlet.jakarta.PrometheusMetricsServlet; import jakarta.servlet.DispatcherType; import jakarta.servlet.Filter; @@ -104,6 +69,41 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.iceberg.rest.RESTSerializers; +import org.apache.polaris.core.PolarisConfigurationStore; +import org.apache.polaris.core.auth.AuthenticatedPolarisPrincipal; +import org.apache.polaris.core.auth.PolarisAuthorizer; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.context.RealmContext; +import org.apache.polaris.core.monitor.PolarisMetricRegistry; +import org.apache.polaris.core.persistence.MetaStoreManagerFactory; +import org.apache.polaris.service.admin.PolarisServiceImpl; +import org.apache.polaris.service.admin.api.PolarisCatalogsApi; +import org.apache.polaris.service.admin.api.PolarisPrincipalRolesApi; +import org.apache.polaris.service.admin.api.PolarisPrincipalsApi; +import org.apache.polaris.service.auth.DiscoverableAuthenticator; +import org.apache.polaris.service.catalog.IcebergCatalogAdapter; +import org.apache.polaris.service.catalog.api.IcebergRestCatalogApi; +import org.apache.polaris.service.catalog.api.IcebergRestConfigurationApi; +import org.apache.polaris.service.catalog.api.IcebergRestOAuth2Api; +import org.apache.polaris.service.config.ConfigurationStoreAware; +import org.apache.polaris.service.config.HasEntityManagerFactory; +import org.apache.polaris.service.config.OAuth2ApiService; +import org.apache.polaris.service.config.PolarisApplicationConfig; +import org.apache.polaris.service.config.RealmEntityManagerFactory; +import org.apache.polaris.service.config.Serializers; +import org.apache.polaris.service.config.TaskHandlerConfiguration; +import org.apache.polaris.service.context.CallContextCatalogFactory; +import org.apache.polaris.service.context.CallContextResolver; +import org.apache.polaris.service.context.PolarisCallContextCatalogFactory; +import org.apache.polaris.service.context.RealmContextResolver; +import org.apache.polaris.service.persistence.InMemoryPolarisMetaStoreManagerFactory; +import org.apache.polaris.service.storage.PolarisStorageIntegrationProviderImpl; +import org.apache.polaris.service.task.ManifestFileCleanupTaskHandler; +import org.apache.polaris.service.task.TableCleanupTaskHandler; +import org.apache.polaris.service.task.TaskExecutorImpl; +import org.apache.polaris.service.task.TaskFileIOSupplier; +import org.apache.polaris.service.tracing.OpenTelemetryAware; +import org.apache.polaris.service.tracing.TracingFilter; import org.eclipse.jetty.servlets.CrossOriginFilter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/polaris-service/src/main/java/io/polaris/service/PolarisHealthCheck.java b/polaris-service/src/main/java/org/apache/polaris/service/PolarisHealthCheck.java similarity index 96% rename from polaris-service/src/main/java/io/polaris/service/PolarisHealthCheck.java rename to polaris-service/src/main/java/org/apache/polaris/service/PolarisHealthCheck.java index 2204e0653c..6f7a897af6 100644 --- a/polaris-service/src/main/java/io/polaris/service/PolarisHealthCheck.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/PolarisHealthCheck.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service; +package org.apache.polaris.service; import com.codahale.metrics.health.HealthCheck; diff --git a/polaris-service/src/main/java/io/polaris/service/PurgeRealmsCommand.java b/polaris-service/src/main/java/org/apache/polaris/service/PurgeRealmsCommand.java similarity index 85% rename from polaris-service/src/main/java/io/polaris/service/PurgeRealmsCommand.java rename to polaris-service/src/main/java/org/apache/polaris/service/PurgeRealmsCommand.java index 6668b20f7c..b234b1b19a 100644 --- a/polaris-service/src/main/java/io/polaris/service/PurgeRealmsCommand.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/PurgeRealmsCommand.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service; +package org.apache.polaris.service; import io.dropwizard.core.cli.ConfiguredCommand; import io.dropwizard.core.setup.Bootstrap; -import io.polaris.core.PolarisConfigurationStore; -import io.polaris.core.persistence.MetaStoreManagerFactory; -import io.polaris.service.config.ConfigurationStoreAware; -import io.polaris.service.config.PolarisApplicationConfig; -import io.polaris.service.config.RealmEntityManagerFactory; -import io.polaris.service.context.CallContextResolver; import net.sourceforge.argparse4j.inf.Namespace; +import org.apache.polaris.core.PolarisConfigurationStore; +import org.apache.polaris.core.persistence.MetaStoreManagerFactory; +import org.apache.polaris.service.config.ConfigurationStoreAware; +import org.apache.polaris.service.config.PolarisApplicationConfig; +import org.apache.polaris.service.config.RealmEntityManagerFactory; +import org.apache.polaris.service.context.CallContextResolver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/polaris-service/src/main/java/io/polaris/service/TimedApplicationEventListener.java b/polaris-service/src/main/java/org/apache/polaris/service/TimedApplicationEventListener.java similarity index 94% rename from polaris-service/src/main/java/io/polaris/service/TimedApplicationEventListener.java rename to polaris-service/src/main/java/org/apache/polaris/service/TimedApplicationEventListener.java index 26e7e018e1..cf24ab6939 100644 --- a/polaris-service/src/main/java/io/polaris/service/TimedApplicationEventListener.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/TimedApplicationEventListener.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service; +package org.apache.polaris.service; import com.google.common.base.Stopwatch; -import io.polaris.core.context.CallContext; -import io.polaris.core.monitor.PolarisMetricRegistry; -import io.polaris.core.resource.TimedApi; import java.lang.reflect.Method; import java.util.concurrent.TimeUnit; import javax.ws.rs.ext.Provider; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.monitor.PolarisMetricRegistry; +import org.apache.polaris.core.resource.TimedApi; import org.glassfish.jersey.server.monitoring.ApplicationEvent; import org.glassfish.jersey.server.monitoring.ApplicationEventListener; import org.glassfish.jersey.server.monitoring.RequestEvent; diff --git a/polaris-service/src/main/java/io/polaris/service/admin/PolarisAdminService.java b/polaris-service/src/main/java/org/apache/polaris/service/admin/PolarisAdminService.java similarity index 96% rename from polaris-service/src/main/java/io/polaris/service/admin/PolarisAdminService.java rename to polaris-service/src/main/java/org/apache/polaris/service/admin/PolarisAdminService.java index bf736599cf..c57c0b3aae 100644 --- a/polaris-service/src/main/java/io/polaris/service/admin/PolarisAdminService.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/admin/PolarisAdminService.java @@ -16,52 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.admin; - -import io.polaris.core.PolarisCallContext; -import io.polaris.core.PolarisConfiguration; -import io.polaris.core.admin.model.CatalogGrant; -import io.polaris.core.admin.model.CatalogPrivilege; -import io.polaris.core.admin.model.GrantResource; -import io.polaris.core.admin.model.NamespaceGrant; -import io.polaris.core.admin.model.NamespacePrivilege; -import io.polaris.core.admin.model.PrincipalWithCredentials; -import io.polaris.core.admin.model.PrincipalWithCredentialsCredentials; -import io.polaris.core.admin.model.TableGrant; -import io.polaris.core.admin.model.TablePrivilege; -import io.polaris.core.admin.model.UpdateCatalogRequest; -import io.polaris.core.admin.model.UpdateCatalogRoleRequest; -import io.polaris.core.admin.model.UpdatePrincipalRequest; -import io.polaris.core.admin.model.UpdatePrincipalRoleRequest; -import io.polaris.core.admin.model.ViewGrant; -import io.polaris.core.admin.model.ViewPrivilege; -import io.polaris.core.auth.AuthenticatedPolarisPrincipal; -import io.polaris.core.auth.PolarisAuthorizableOperation; -import io.polaris.core.auth.PolarisAuthorizer; -import io.polaris.core.catalog.PolarisCatalogHelpers; -import io.polaris.core.context.CallContext; -import io.polaris.core.entity.CatalogEntity; -import io.polaris.core.entity.CatalogRoleEntity; -import io.polaris.core.entity.NamespaceEntity; -import io.polaris.core.entity.PolarisBaseEntity; -import io.polaris.core.entity.PolarisEntity; -import io.polaris.core.entity.PolarisEntitySubType; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.entity.PolarisGrantRecord; -import io.polaris.core.entity.PolarisPrincipalSecrets; -import io.polaris.core.entity.PolarisPrivilege; -import io.polaris.core.entity.PrincipalEntity; -import io.polaris.core.entity.PrincipalRoleEntity; -import io.polaris.core.entity.TableLikeEntity; -import io.polaris.core.persistence.PolarisEntityManager; -import io.polaris.core.persistence.PolarisMetaStoreManager; -import io.polaris.core.persistence.PolarisResolvedPathWrapper; -import io.polaris.core.persistence.resolver.PolarisResolutionManifest; -import io.polaris.core.persistence.resolver.ResolverPath; -import io.polaris.core.persistence.resolver.ResolverStatus; -import io.polaris.core.storage.PolarisStorageConfigurationInfo; -import io.polaris.core.storage.aws.AwsStorageConfigurationInfo; -import io.polaris.core.storage.azure.AzureStorageConfigurationInfo; +package org.apache.polaris.service.admin; + import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; @@ -80,6 +36,50 @@ import org.apache.iceberg.exceptions.NoSuchViewException; import org.apache.iceberg.exceptions.NotFoundException; import org.apache.iceberg.exceptions.ValidationException; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.PolarisConfiguration; +import org.apache.polaris.core.admin.model.CatalogGrant; +import org.apache.polaris.core.admin.model.CatalogPrivilege; +import org.apache.polaris.core.admin.model.GrantResource; +import org.apache.polaris.core.admin.model.NamespaceGrant; +import org.apache.polaris.core.admin.model.NamespacePrivilege; +import org.apache.polaris.core.admin.model.PrincipalWithCredentials; +import org.apache.polaris.core.admin.model.PrincipalWithCredentialsCredentials; +import org.apache.polaris.core.admin.model.TableGrant; +import org.apache.polaris.core.admin.model.TablePrivilege; +import org.apache.polaris.core.admin.model.UpdateCatalogRequest; +import org.apache.polaris.core.admin.model.UpdateCatalogRoleRequest; +import org.apache.polaris.core.admin.model.UpdatePrincipalRequest; +import org.apache.polaris.core.admin.model.UpdatePrincipalRoleRequest; +import org.apache.polaris.core.admin.model.ViewGrant; +import org.apache.polaris.core.admin.model.ViewPrivilege; +import org.apache.polaris.core.auth.AuthenticatedPolarisPrincipal; +import org.apache.polaris.core.auth.PolarisAuthorizableOperation; +import org.apache.polaris.core.auth.PolarisAuthorizer; +import org.apache.polaris.core.catalog.PolarisCatalogHelpers; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.entity.CatalogEntity; +import org.apache.polaris.core.entity.CatalogRoleEntity; +import org.apache.polaris.core.entity.NamespaceEntity; +import org.apache.polaris.core.entity.PolarisBaseEntity; +import org.apache.polaris.core.entity.PolarisEntity; +import org.apache.polaris.core.entity.PolarisEntitySubType; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.entity.PolarisGrantRecord; +import org.apache.polaris.core.entity.PolarisPrincipalSecrets; +import org.apache.polaris.core.entity.PolarisPrivilege; +import org.apache.polaris.core.entity.PrincipalEntity; +import org.apache.polaris.core.entity.PrincipalRoleEntity; +import org.apache.polaris.core.entity.TableLikeEntity; +import org.apache.polaris.core.persistence.PolarisEntityManager; +import org.apache.polaris.core.persistence.PolarisMetaStoreManager; +import org.apache.polaris.core.persistence.PolarisResolvedPathWrapper; +import org.apache.polaris.core.persistence.resolver.PolarisResolutionManifest; +import org.apache.polaris.core.persistence.resolver.ResolverPath; +import org.apache.polaris.core.persistence.resolver.ResolverStatus; +import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo; +import org.apache.polaris.core.storage.aws.AwsStorageConfigurationInfo; +import org.apache.polaris.core.storage.azure.AzureStorageConfigurationInfo; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; diff --git a/polaris-service/src/main/java/io/polaris/service/admin/PolarisServiceImpl.java b/polaris-service/src/main/java/org/apache/polaris/service/admin/PolarisServiceImpl.java similarity index 90% rename from polaris-service/src/main/java/io/polaris/service/admin/PolarisServiceImpl.java rename to polaris-service/src/main/java/org/apache/polaris/service/admin/PolarisServiceImpl.java index fa1cb42dc9..653b962854 100644 --- a/polaris-service/src/main/java/io/polaris/service/admin/PolarisServiceImpl.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/admin/PolarisServiceImpl.java @@ -16,56 +16,56 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.admin; - -import io.polaris.core.PolarisCallContext; -import io.polaris.core.admin.model.AddGrantRequest; -import io.polaris.core.admin.model.Catalog; -import io.polaris.core.admin.model.CatalogGrant; -import io.polaris.core.admin.model.CatalogRole; -import io.polaris.core.admin.model.CatalogRoles; -import io.polaris.core.admin.model.Catalogs; -import io.polaris.core.admin.model.CreateCatalogRequest; -import io.polaris.core.admin.model.CreateCatalogRoleRequest; -import io.polaris.core.admin.model.CreatePrincipalRequest; -import io.polaris.core.admin.model.CreatePrincipalRoleRequest; -import io.polaris.core.admin.model.GrantCatalogRoleRequest; -import io.polaris.core.admin.model.GrantPrincipalRoleRequest; -import io.polaris.core.admin.model.GrantResource; -import io.polaris.core.admin.model.GrantResources; -import io.polaris.core.admin.model.NamespaceGrant; -import io.polaris.core.admin.model.Principal; -import io.polaris.core.admin.model.PrincipalRole; -import io.polaris.core.admin.model.PrincipalRoles; -import io.polaris.core.admin.model.PrincipalWithCredentials; -import io.polaris.core.admin.model.Principals; -import io.polaris.core.admin.model.RevokeGrantRequest; -import io.polaris.core.admin.model.StorageConfigInfo; -import io.polaris.core.admin.model.TableGrant; -import io.polaris.core.admin.model.UpdateCatalogRequest; -import io.polaris.core.admin.model.UpdateCatalogRoleRequest; -import io.polaris.core.admin.model.UpdatePrincipalRequest; -import io.polaris.core.admin.model.UpdatePrincipalRoleRequest; -import io.polaris.core.admin.model.ViewGrant; -import io.polaris.core.auth.AuthenticatedPolarisPrincipal; -import io.polaris.core.auth.PolarisAuthorizer; -import io.polaris.core.context.CallContext; -import io.polaris.core.entity.CatalogEntity; -import io.polaris.core.entity.CatalogRoleEntity; -import io.polaris.core.entity.PolarisPrivilege; -import io.polaris.core.entity.PrincipalEntity; -import io.polaris.core.entity.PrincipalRoleEntity; -import io.polaris.core.persistence.PolarisEntityManager; -import io.polaris.service.admin.api.PolarisCatalogsApiService; -import io.polaris.service.admin.api.PolarisPrincipalRolesApiService; -import io.polaris.service.admin.api.PolarisPrincipalsApiService; -import io.polaris.service.config.RealmEntityManagerFactory; +package org.apache.polaris.service.admin; + import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.SecurityContext; import java.util.List; import org.apache.iceberg.catalog.Namespace; import org.apache.iceberg.catalog.TableIdentifier; import org.apache.iceberg.exceptions.NotAuthorizedException; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.admin.model.AddGrantRequest; +import org.apache.polaris.core.admin.model.Catalog; +import org.apache.polaris.core.admin.model.CatalogGrant; +import org.apache.polaris.core.admin.model.CatalogRole; +import org.apache.polaris.core.admin.model.CatalogRoles; +import org.apache.polaris.core.admin.model.Catalogs; +import org.apache.polaris.core.admin.model.CreateCatalogRequest; +import org.apache.polaris.core.admin.model.CreateCatalogRoleRequest; +import org.apache.polaris.core.admin.model.CreatePrincipalRequest; +import org.apache.polaris.core.admin.model.CreatePrincipalRoleRequest; +import org.apache.polaris.core.admin.model.GrantCatalogRoleRequest; +import org.apache.polaris.core.admin.model.GrantPrincipalRoleRequest; +import org.apache.polaris.core.admin.model.GrantResource; +import org.apache.polaris.core.admin.model.GrantResources; +import org.apache.polaris.core.admin.model.NamespaceGrant; +import org.apache.polaris.core.admin.model.Principal; +import org.apache.polaris.core.admin.model.PrincipalRole; +import org.apache.polaris.core.admin.model.PrincipalRoles; +import org.apache.polaris.core.admin.model.PrincipalWithCredentials; +import org.apache.polaris.core.admin.model.Principals; +import org.apache.polaris.core.admin.model.RevokeGrantRequest; +import org.apache.polaris.core.admin.model.StorageConfigInfo; +import org.apache.polaris.core.admin.model.TableGrant; +import org.apache.polaris.core.admin.model.UpdateCatalogRequest; +import org.apache.polaris.core.admin.model.UpdateCatalogRoleRequest; +import org.apache.polaris.core.admin.model.UpdatePrincipalRequest; +import org.apache.polaris.core.admin.model.UpdatePrincipalRoleRequest; +import org.apache.polaris.core.admin.model.ViewGrant; +import org.apache.polaris.core.auth.AuthenticatedPolarisPrincipal; +import org.apache.polaris.core.auth.PolarisAuthorizer; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.entity.CatalogEntity; +import org.apache.polaris.core.entity.CatalogRoleEntity; +import org.apache.polaris.core.entity.PolarisPrivilege; +import org.apache.polaris.core.entity.PrincipalEntity; +import org.apache.polaris.core.entity.PrincipalRoleEntity; +import org.apache.polaris.core.persistence.PolarisEntityManager; +import org.apache.polaris.service.admin.api.PolarisCatalogsApiService; +import org.apache.polaris.service.admin.api.PolarisPrincipalRolesApiService; +import org.apache.polaris.service.admin.api.PolarisPrincipalsApiService; +import org.apache.polaris.service.config.RealmEntityManagerFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/polaris-service/src/main/java/io/polaris/service/auth/BasePolarisAuthenticator.java b/polaris-service/src/main/java/org/apache/polaris/service/auth/BasePolarisAuthenticator.java similarity index 88% rename from polaris-service/src/main/java/io/polaris/service/auth/BasePolarisAuthenticator.java rename to polaris-service/src/main/java/org/apache/polaris/service/auth/BasePolarisAuthenticator.java index 6bc9cedfa7..45fe9fc397 100644 --- a/polaris-service/src/main/java/io/polaris/service/auth/BasePolarisAuthenticator.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/auth/BasePolarisAuthenticator.java @@ -16,24 +16,24 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.auth; +package org.apache.polaris.service.auth; -import io.polaris.core.PolarisCallContext; -import io.polaris.core.auth.AuthenticatedPolarisPrincipal; -import io.polaris.core.context.CallContext; -import io.polaris.core.context.RealmContext; -import io.polaris.core.entity.PolarisEntity; -import io.polaris.core.entity.PolarisEntitySubType; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.entity.PrincipalEntity; -import io.polaris.core.persistence.PolarisMetaStoreManager; -import io.polaris.service.config.RealmEntityManagerFactory; import java.util.Arrays; import java.util.HashSet; import java.util.Optional; import java.util.Set; import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.iceberg.exceptions.NotAuthorizedException; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.auth.AuthenticatedPolarisPrincipal; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.context.RealmContext; +import org.apache.polaris.core.entity.PolarisEntity; +import org.apache.polaris.core.entity.PolarisEntitySubType; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.entity.PrincipalEntity; +import org.apache.polaris.core.persistence.PolarisMetaStoreManager; +import org.apache.polaris.service.config.RealmEntityManagerFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/polaris-service/src/main/java/io/polaris/service/auth/DecodedToken.java b/polaris-service/src/main/java/org/apache/polaris/service/auth/DecodedToken.java similarity index 95% rename from polaris-service/src/main/java/io/polaris/service/auth/DecodedToken.java rename to polaris-service/src/main/java/org/apache/polaris/service/auth/DecodedToken.java index d688630d03..487173f34f 100644 --- a/polaris-service/src/main/java/io/polaris/service/auth/DecodedToken.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/auth/DecodedToken.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.auth; +package org.apache.polaris.service.auth; public interface DecodedToken { Long getPrincipalId(); diff --git a/polaris-service/src/main/java/io/polaris/service/auth/DefaultOAuth2ApiService.java b/polaris-service/src/main/java/org/apache/polaris/service/auth/DefaultOAuth2ApiService.java similarity index 94% rename from polaris-service/src/main/java/io/polaris/service/auth/DefaultOAuth2ApiService.java rename to polaris-service/src/main/java/org/apache/polaris/service/auth/DefaultOAuth2ApiService.java index 3509603aea..49854ee866 100644 --- a/polaris-service/src/main/java/io/polaris/service/auth/DefaultOAuth2ApiService.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/auth/DefaultOAuth2ApiService.java @@ -16,16 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.auth; +package org.apache.polaris.service.auth; import static java.nio.charset.StandardCharsets.UTF_8; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.polaris.core.context.CallContext; -import io.polaris.service.config.HasEntityManagerFactory; -import io.polaris.service.config.OAuth2ApiService; -import io.polaris.service.config.RealmEntityManagerFactory; -import io.polaris.service.types.TokenType; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.SecurityContext; import java.net.URLDecoder; @@ -34,6 +29,11 @@ import org.apache.hadoop.hdfs.web.oauth2.OAuth2Constants; import org.apache.iceberg.rest.auth.OAuth2Properties; import org.apache.iceberg.rest.responses.OAuthTokenResponse; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.service.config.HasEntityManagerFactory; +import org.apache.polaris.service.config.OAuth2ApiService; +import org.apache.polaris.service.config.RealmEntityManagerFactory; +import org.apache.polaris.service.types.TokenType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/polaris-service/src/main/java/io/polaris/service/auth/DefaultPolarisAuthenticator.java b/polaris-service/src/main/java/org/apache/polaris/service/auth/DefaultPolarisAuthenticator.java similarity index 86% rename from polaris-service/src/main/java/io/polaris/service/auth/DefaultPolarisAuthenticator.java rename to polaris-service/src/main/java/org/apache/polaris/service/auth/DefaultPolarisAuthenticator.java index 3d4f0faf9e..d85dccd9e2 100644 --- a/polaris-service/src/main/java/io/polaris/service/auth/DefaultPolarisAuthenticator.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/auth/DefaultPolarisAuthenticator.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.auth; +package org.apache.polaris.service.auth; import com.fasterxml.jackson.annotation.JsonProperty; -import io.polaris.core.auth.AuthenticatedPolarisPrincipal; -import io.polaris.core.context.CallContext; -import io.polaris.service.config.HasEntityManagerFactory; -import io.polaris.service.config.RealmEntityManagerFactory; import java.util.Optional; +import org.apache.polaris.core.auth.AuthenticatedPolarisPrincipal; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.service.config.HasEntityManagerFactory; +import org.apache.polaris.service.config.RealmEntityManagerFactory; public class DefaultPolarisAuthenticator extends BasePolarisAuthenticator { private TokenBrokerFactory tokenBrokerFactory; diff --git a/polaris-service/src/main/java/io/polaris/service/auth/DiscoverableAuthenticator.java b/polaris-service/src/main/java/org/apache/polaris/service/auth/DiscoverableAuthenticator.java similarity index 93% rename from polaris-service/src/main/java/io/polaris/service/auth/DiscoverableAuthenticator.java rename to polaris-service/src/main/java/org/apache/polaris/service/auth/DiscoverableAuthenticator.java index 48acc25760..cd3b6e38c6 100644 --- a/polaris-service/src/main/java/io/polaris/service/auth/DiscoverableAuthenticator.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/auth/DiscoverableAuthenticator.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.auth; +package org.apache.polaris.service.auth; import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.dropwizard.auth.Authenticator; import io.dropwizard.jackson.Discoverable; -import io.polaris.service.config.HasEntityManagerFactory; import java.security.Principal; +import org.apache.polaris.service.config.HasEntityManagerFactory; /** * Extension of the {@link Authenticator} interface that extends {@link Discoverable} so diff --git a/polaris-service/src/main/java/io/polaris/service/auth/JWTBroker.java b/polaris-service/src/main/java/org/apache/polaris/service/auth/JWTBroker.java similarity index 94% rename from polaris-service/src/main/java/io/polaris/service/auth/JWTBroker.java rename to polaris-service/src/main/java/org/apache/polaris/service/auth/JWTBroker.java index 3508c05952..5caeac21d8 100644 --- a/polaris-service/src/main/java/io/polaris/service/auth/JWTBroker.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/auth/JWTBroker.java @@ -16,24 +16,24 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.auth; +package org.apache.polaris.service.auth; import com.auth0.jwt.JWT; import com.auth0.jwt.algorithms.Algorithm; import com.auth0.jwt.interfaces.DecodedJWT; import com.auth0.jwt.interfaces.JWTVerifier; -import io.polaris.core.context.CallContext; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.entity.PrincipalEntity; -import io.polaris.core.persistence.PolarisEntityManager; -import io.polaris.core.persistence.PolarisMetaStoreManager; -import io.polaris.service.types.TokenType; import java.time.Instant; import java.time.temporal.ChronoUnit; import java.util.Optional; import java.util.UUID; import org.apache.commons.lang3.StringUtils; import org.apache.iceberg.exceptions.NotAuthorizedException; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.entity.PrincipalEntity; +import org.apache.polaris.core.persistence.PolarisEntityManager; +import org.apache.polaris.core.persistence.PolarisMetaStoreManager; +import org.apache.polaris.service.types.TokenType; /** Generates a JWT Token. */ abstract class JWTBroker implements TokenBroker { diff --git a/polaris-service/src/main/java/io/polaris/service/auth/JWTRSAKeyPair.java b/polaris-service/src/main/java/org/apache/polaris/service/auth/JWTRSAKeyPair.java similarity index 93% rename from polaris-service/src/main/java/io/polaris/service/auth/JWTRSAKeyPair.java rename to polaris-service/src/main/java/org/apache/polaris/service/auth/JWTRSAKeyPair.java index 7ef6559406..7de5c7eca5 100644 --- a/polaris-service/src/main/java/io/polaris/service/auth/JWTRSAKeyPair.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/auth/JWTRSAKeyPair.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.auth; +package org.apache.polaris.service.auth; import com.auth0.jwt.algorithms.Algorithm; -import io.polaris.core.persistence.PolarisEntityManager; import java.security.interfaces.RSAPrivateKey; import java.security.interfaces.RSAPublicKey; +import org.apache.polaris.core.persistence.PolarisEntityManager; /** Generates a JWT using a Public/Private RSA Key */ public class JWTRSAKeyPair extends JWTBroker { diff --git a/polaris-service/src/main/java/io/polaris/service/auth/JWTRSAKeyPairFactory.java b/polaris-service/src/main/java/org/apache/polaris/service/auth/JWTRSAKeyPairFactory.java similarity index 87% rename from polaris-service/src/main/java/io/polaris/service/auth/JWTRSAKeyPairFactory.java rename to polaris-service/src/main/java/org/apache/polaris/service/auth/JWTRSAKeyPairFactory.java index 5c6fba3a65..8ac2b1c2ba 100644 --- a/polaris-service/src/main/java/io/polaris/service/auth/JWTRSAKeyPairFactory.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/auth/JWTRSAKeyPairFactory.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.auth; +package org.apache.polaris.service.auth; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.polaris.core.context.RealmContext; -import io.polaris.service.config.HasEntityManagerFactory; -import io.polaris.service.config.RealmEntityManagerFactory; +import org.apache.polaris.core.context.RealmContext; +import org.apache.polaris.service.config.HasEntityManagerFactory; +import org.apache.polaris.service.config.RealmEntityManagerFactory; @JsonTypeName("rsa-key-pair") public class JWTRSAKeyPairFactory implements TokenBrokerFactory, HasEntityManagerFactory { diff --git a/polaris-service/src/main/java/io/polaris/service/auth/JWTSymmetricKeyBroker.java b/polaris-service/src/main/java/org/apache/polaris/service/auth/JWTSymmetricKeyBroker.java similarity index 92% rename from polaris-service/src/main/java/io/polaris/service/auth/JWTSymmetricKeyBroker.java rename to polaris-service/src/main/java/org/apache/polaris/service/auth/JWTSymmetricKeyBroker.java index 2b3923e1e6..c523e37ae1 100644 --- a/polaris-service/src/main/java/io/polaris/service/auth/JWTSymmetricKeyBroker.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/auth/JWTSymmetricKeyBroker.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.auth; +package org.apache.polaris.service.auth; import com.auth0.jwt.algorithms.Algorithm; -import io.polaris.core.persistence.PolarisEntityManager; import java.util.function.Supplier; +import org.apache.polaris.core.persistence.PolarisEntityManager; /** Generates a JWT using a Symmetric Key. */ public class JWTSymmetricKeyBroker extends JWTBroker { diff --git a/polaris-service/src/main/java/io/polaris/service/auth/JWTSymmetricKeyFactory.java b/polaris-service/src/main/java/org/apache/polaris/service/auth/JWTSymmetricKeyFactory.java similarity index 91% rename from polaris-service/src/main/java/io/polaris/service/auth/JWTSymmetricKeyFactory.java rename to polaris-service/src/main/java/org/apache/polaris/service/auth/JWTSymmetricKeyFactory.java index dde74d4ed9..ee6468c144 100644 --- a/polaris-service/src/main/java/io/polaris/service/auth/JWTSymmetricKeyFactory.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/auth/JWTSymmetricKeyFactory.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.auth; +package org.apache.polaris.service.auth; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.polaris.core.context.RealmContext; -import io.polaris.service.config.HasEntityManagerFactory; -import io.polaris.service.config.RealmEntityManagerFactory; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; import java.util.function.Supplier; +import org.apache.polaris.core.context.RealmContext; +import org.apache.polaris.service.config.HasEntityManagerFactory; +import org.apache.polaris.service.config.RealmEntityManagerFactory; @JsonTypeName("symmetric-key") public class JWTSymmetricKeyFactory implements TokenBrokerFactory, HasEntityManagerFactory { diff --git a/polaris-service/src/main/java/io/polaris/service/auth/KeyProvider.java b/polaris-service/src/main/java/org/apache/polaris/service/auth/KeyProvider.java similarity index 96% rename from polaris-service/src/main/java/io/polaris/service/auth/KeyProvider.java rename to polaris-service/src/main/java/org/apache/polaris/service/auth/KeyProvider.java index accc532593..bdd07e9bfc 100644 --- a/polaris-service/src/main/java/io/polaris/service/auth/KeyProvider.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/auth/KeyProvider.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.auth; +package org.apache.polaris.service.auth; import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.dropwizard.jackson.Discoverable; diff --git a/polaris-service/src/main/java/io/polaris/service/auth/LocalRSAKeyProvider.java b/polaris-service/src/main/java/org/apache/polaris/service/auth/LocalRSAKeyProvider.java similarity index 95% rename from polaris-service/src/main/java/io/polaris/service/auth/LocalRSAKeyProvider.java rename to polaris-service/src/main/java/org/apache/polaris/service/auth/LocalRSAKeyProvider.java index b2f167d668..666af1f2ae 100644 --- a/polaris-service/src/main/java/io/polaris/service/auth/LocalRSAKeyProvider.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/auth/LocalRSAKeyProvider.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.auth; +package org.apache.polaris.service.auth; -import io.polaris.core.PolarisCallContext; -import io.polaris.core.context.CallContext; import java.io.IOException; import java.security.PrivateKey; import java.security.PublicKey; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.context.CallContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/polaris-service/src/main/java/io/polaris/service/auth/OAuthTokenErrorResponse.java b/polaris-service/src/main/java/org/apache/polaris/service/auth/OAuthTokenErrorResponse.java similarity index 98% rename from polaris-service/src/main/java/io/polaris/service/auth/OAuthTokenErrorResponse.java rename to polaris-service/src/main/java/org/apache/polaris/service/auth/OAuthTokenErrorResponse.java index 620fd6ee56..bd81407679 100644 --- a/polaris-service/src/main/java/io/polaris/service/auth/OAuthTokenErrorResponse.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/auth/OAuthTokenErrorResponse.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.auth; +package org.apache.polaris.service.auth; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/polaris-service/src/main/java/io/polaris/service/auth/OAuthUtils.java b/polaris-service/src/main/java/org/apache/polaris/service/auth/OAuthUtils.java similarity index 98% rename from polaris-service/src/main/java/io/polaris/service/auth/OAuthUtils.java rename to polaris-service/src/main/java/org/apache/polaris/service/auth/OAuthUtils.java index d60a938f53..2b3e928e98 100644 --- a/polaris-service/src/main/java/io/polaris/service/auth/OAuthUtils.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/auth/OAuthUtils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.auth; +package org.apache.polaris.service.auth; import jakarta.ws.rs.core.Response; diff --git a/polaris-service/src/main/java/io/polaris/service/auth/PemUtils.java b/polaris-service/src/main/java/org/apache/polaris/service/auth/PemUtils.java similarity index 98% rename from polaris-service/src/main/java/io/polaris/service/auth/PemUtils.java rename to polaris-service/src/main/java/org/apache/polaris/service/auth/PemUtils.java index 13d1698ae4..24c43a7f0c 100644 --- a/polaris-service/src/main/java/io/polaris/service/auth/PemUtils.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/auth/PemUtils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.auth; +package org.apache.polaris.service.auth; import static java.nio.charset.StandardCharsets.UTF_8; diff --git a/polaris-service/src/main/java/io/polaris/service/auth/TestInlineBearerTokenPolarisAuthenticator.java b/polaris-service/src/main/java/org/apache/polaris/service/auth/TestInlineBearerTokenPolarisAuthenticator.java similarity index 91% rename from polaris-service/src/main/java/io/polaris/service/auth/TestInlineBearerTokenPolarisAuthenticator.java rename to polaris-service/src/main/java/org/apache/polaris/service/auth/TestInlineBearerTokenPolarisAuthenticator.java index d05a305ec8..bb0b25c052 100644 --- a/polaris-service/src/main/java/io/polaris/service/auth/TestInlineBearerTokenPolarisAuthenticator.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/auth/TestInlineBearerTokenPolarisAuthenticator.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.auth; +package org.apache.polaris.service.auth; import com.google.common.base.Splitter; import io.dropwizard.auth.AuthenticationException; -import io.polaris.core.PolarisCallContext; -import io.polaris.core.auth.AuthenticatedPolarisPrincipal; -import io.polaris.core.context.CallContext; -import io.polaris.core.entity.PolarisPrincipalSecrets; -import io.polaris.core.persistence.PolarisMetaStoreManager; import java.util.Arrays; import java.util.HashMap; import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.auth.AuthenticatedPolarisPrincipal; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.entity.PolarisPrincipalSecrets; +import org.apache.polaris.core.persistence.PolarisMetaStoreManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/polaris-service/src/main/java/io/polaris/service/auth/TestOAuth2ApiService.java b/polaris-service/src/main/java/org/apache/polaris/service/auth/TestOAuth2ApiService.java similarity index 87% rename from polaris-service/src/main/java/io/polaris/service/auth/TestOAuth2ApiService.java rename to polaris-service/src/main/java/org/apache/polaris/service/auth/TestOAuth2ApiService.java index b54c1affbf..8a664fd5aa 100644 --- a/polaris-service/src/main/java/io/polaris/service/auth/TestOAuth2ApiService.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/auth/TestOAuth2ApiService.java @@ -16,25 +16,25 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.auth; +package org.apache.polaris.service.auth; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.polaris.core.PolarisCallContext; -import io.polaris.core.context.CallContext; -import io.polaris.core.entity.PolarisEntitySubType; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.persistence.PolarisEntityManager; -import io.polaris.core.persistence.PolarisMetaStoreManager; -import io.polaris.service.config.HasEntityManagerFactory; -import io.polaris.service.config.OAuth2ApiService; -import io.polaris.service.config.RealmEntityManagerFactory; -import io.polaris.service.types.TokenType; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.SecurityContext; import java.util.HashMap; import java.util.Map; import java.util.Objects; import org.apache.iceberg.exceptions.NotAuthorizedException; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.entity.PolarisEntitySubType; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.persistence.PolarisEntityManager; +import org.apache.polaris.core.persistence.PolarisMetaStoreManager; +import org.apache.polaris.service.config.HasEntityManagerFactory; +import org.apache.polaris.service.config.OAuth2ApiService; +import org.apache.polaris.service.config.RealmEntityManagerFactory; +import org.apache.polaris.service.types.TokenType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/polaris-service/src/main/java/io/polaris/service/auth/TokenBroker.java b/polaris-service/src/main/java/org/apache/polaris/service/auth/TokenBroker.java similarity index 85% rename from polaris-service/src/main/java/io/polaris/service/auth/TokenBroker.java rename to polaris-service/src/main/java/org/apache/polaris/service/auth/TokenBroker.java index 55c4e313ee..86bd2748eb 100644 --- a/polaris-service/src/main/java/io/polaris/service/auth/TokenBroker.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/auth/TokenBroker.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.auth; +package org.apache.polaris.service.auth; -import io.polaris.core.PolarisCallContext; -import io.polaris.core.context.CallContext; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.entity.PrincipalEntity; -import io.polaris.core.persistence.PolarisEntityManager; -import io.polaris.core.persistence.PolarisMetaStoreManager; -import io.polaris.service.types.TokenType; import java.util.Optional; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.entity.PrincipalEntity; +import org.apache.polaris.core.persistence.PolarisEntityManager; +import org.apache.polaris.core.persistence.PolarisMetaStoreManager; +import org.apache.polaris.service.types.TokenType; import org.jetbrains.annotations.NotNull; /** Generic token class intended to be extended by different token types */ diff --git a/polaris-service/src/main/java/io/polaris/service/auth/TokenBrokerFactory.java b/polaris-service/src/main/java/org/apache/polaris/service/auth/TokenBrokerFactory.java similarity index 93% rename from polaris-service/src/main/java/io/polaris/service/auth/TokenBrokerFactory.java rename to polaris-service/src/main/java/org/apache/polaris/service/auth/TokenBrokerFactory.java index df130defc4..abb15c9dbd 100644 --- a/polaris-service/src/main/java/io/polaris/service/auth/TokenBrokerFactory.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/auth/TokenBrokerFactory.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.auth; +package org.apache.polaris.service.auth; import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.dropwizard.jackson.Discoverable; -import io.polaris.core.context.RealmContext; import java.util.function.Function; +import org.apache.polaris.core.context.RealmContext; /** * Factory that creates a {@link TokenBroker} for generating and parsing. The {@link TokenBroker} is diff --git a/polaris-service/src/main/java/io/polaris/service/auth/TokenInfoExchangeResponse.java b/polaris-service/src/main/java/org/apache/polaris/service/auth/TokenInfoExchangeResponse.java similarity index 98% rename from polaris-service/src/main/java/io/polaris/service/auth/TokenInfoExchangeResponse.java rename to polaris-service/src/main/java/org/apache/polaris/service/auth/TokenInfoExchangeResponse.java index a34344c032..8e580c6565 100644 --- a/polaris-service/src/main/java/io/polaris/service/auth/TokenInfoExchangeResponse.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/auth/TokenInfoExchangeResponse.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.auth; +package org.apache.polaris.service.auth; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/polaris-service/src/main/java/io/polaris/service/auth/TokenRequestValidator.java b/polaris-service/src/main/java/org/apache/polaris/service/auth/TokenRequestValidator.java similarity index 98% rename from polaris-service/src/main/java/io/polaris/service/auth/TokenRequestValidator.java rename to polaris-service/src/main/java/org/apache/polaris/service/auth/TokenRequestValidator.java index 04c8ccae6d..b123620cbb 100644 --- a/polaris-service/src/main/java/io/polaris/service/auth/TokenRequestValidator.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/auth/TokenRequestValidator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.auth; +package org.apache.polaris.service.auth; import java.util.Optional; import java.util.Set; diff --git a/polaris-service/src/main/java/io/polaris/service/auth/TokenResponse.java b/polaris-service/src/main/java/org/apache/polaris/service/auth/TokenResponse.java similarity index 97% rename from polaris-service/src/main/java/io/polaris/service/auth/TokenResponse.java rename to polaris-service/src/main/java/org/apache/polaris/service/auth/TokenResponse.java index b3354a1fe3..84d0310a2d 100644 --- a/polaris-service/src/main/java/io/polaris/service/auth/TokenResponse.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/auth/TokenResponse.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.auth; +package org.apache.polaris.service.auth; import java.util.Optional; diff --git a/polaris-service/src/main/java/io/polaris/service/catalog/BasePolarisCatalog.java b/polaris-service/src/main/java/org/apache/polaris/service/catalog/BasePolarisCatalog.java similarity index 97% rename from polaris-service/src/main/java/io/polaris/service/catalog/BasePolarisCatalog.java rename to polaris-service/src/main/java/org/apache/polaris/service/catalog/BasePolarisCatalog.java index 5b0c1fce6c..8d8d1e9697 100644 --- a/polaris-service/src/main/java/io/polaris/service/catalog/BasePolarisCatalog.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/catalog/BasePolarisCatalog.java @@ -16,43 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.catalog; +package org.apache.polaris.service.catalog; -import static io.polaris.core.storage.StorageUtil.concatFilePrefixes; +import static org.apache.polaris.core.storage.StorageUtil.concatFilePrefixes; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Joiner; import com.google.common.base.Objects; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; -import io.polaris.core.PolarisCallContext; -import io.polaris.core.PolarisConfiguration; -import io.polaris.core.auth.AuthenticatedPolarisPrincipal; -import io.polaris.core.catalog.PolarisCatalogHelpers; -import io.polaris.core.context.CallContext; -import io.polaris.core.entity.CatalogEntity; -import io.polaris.core.entity.NamespaceEntity; -import io.polaris.core.entity.PolarisEntity; -import io.polaris.core.entity.PolarisEntityConstants; -import io.polaris.core.entity.PolarisEntitySubType; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.entity.PolarisTaskConstants; -import io.polaris.core.entity.TableLikeEntity; -import io.polaris.core.persistence.PolarisEntityManager; -import io.polaris.core.persistence.PolarisMetaStoreManager; -import io.polaris.core.persistence.PolarisResolvedPathWrapper; -import io.polaris.core.persistence.resolver.PolarisResolutionManifest; -import io.polaris.core.persistence.resolver.PolarisResolutionManifestCatalogView; -import io.polaris.core.persistence.resolver.ResolverPath; -import io.polaris.core.persistence.resolver.ResolverStatus; -import io.polaris.core.storage.InMemoryStorageIntegration; -import io.polaris.core.storage.PolarisStorageActions; -import io.polaris.core.storage.PolarisStorageConfigurationInfo; -import io.polaris.core.storage.PolarisStorageIntegration; -import io.polaris.core.storage.aws.PolarisS3FileIOClientFactory; -import io.polaris.service.task.TaskExecutor; -import io.polaris.service.types.NotificationRequest; -import io.polaris.service.types.NotificationType; import jakarta.ws.rs.BadRequestException; import java.io.Closeable; import java.io.IOException; @@ -101,6 +73,34 @@ import org.apache.iceberg.view.ViewMetadataParser; import org.apache.iceberg.view.ViewOperations; import org.apache.iceberg.view.ViewUtil; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.PolarisConfiguration; +import org.apache.polaris.core.auth.AuthenticatedPolarisPrincipal; +import org.apache.polaris.core.catalog.PolarisCatalogHelpers; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.entity.CatalogEntity; +import org.apache.polaris.core.entity.NamespaceEntity; +import org.apache.polaris.core.entity.PolarisEntity; +import org.apache.polaris.core.entity.PolarisEntityConstants; +import org.apache.polaris.core.entity.PolarisEntitySubType; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.entity.PolarisTaskConstants; +import org.apache.polaris.core.entity.TableLikeEntity; +import org.apache.polaris.core.persistence.PolarisEntityManager; +import org.apache.polaris.core.persistence.PolarisMetaStoreManager; +import org.apache.polaris.core.persistence.PolarisResolvedPathWrapper; +import org.apache.polaris.core.persistence.resolver.PolarisResolutionManifest; +import org.apache.polaris.core.persistence.resolver.PolarisResolutionManifestCatalogView; +import org.apache.polaris.core.persistence.resolver.ResolverPath; +import org.apache.polaris.core.persistence.resolver.ResolverStatus; +import org.apache.polaris.core.storage.InMemoryStorageIntegration; +import org.apache.polaris.core.storage.PolarisStorageActions; +import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo; +import org.apache.polaris.core.storage.PolarisStorageIntegration; +import org.apache.polaris.core.storage.aws.PolarisS3FileIOClientFactory; +import org.apache.polaris.service.task.TaskExecutor; +import org.apache.polaris.service.types.NotificationRequest; +import org.apache.polaris.service.types.NotificationType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.TestOnly; import org.slf4j.Logger; diff --git a/polaris-service/src/main/java/io/polaris/service/catalog/IcebergCatalogAdapter.java b/polaris-service/src/main/java/org/apache/polaris/service/catalog/IcebergCatalogAdapter.java similarity index 94% rename from polaris-service/src/main/java/io/polaris/service/catalog/IcebergCatalogAdapter.java rename to polaris-service/src/main/java/org/apache/polaris/service/catalog/IcebergCatalogAdapter.java index 7153b6b817..5d15fc5381 100644 --- a/polaris-service/src/main/java/io/polaris/service/catalog/IcebergCatalogAdapter.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/catalog/IcebergCatalogAdapter.java @@ -16,27 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.catalog; +package org.apache.polaris.service.catalog; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; -import io.polaris.core.auth.AuthenticatedPolarisPrincipal; -import io.polaris.core.auth.PolarisAuthorizer; -import io.polaris.core.context.CallContext; -import io.polaris.core.context.RealmContext; -import io.polaris.core.entity.PolarisEntity; -import io.polaris.core.persistence.PolarisEntityManager; -import io.polaris.core.persistence.cache.EntityCacheEntry; -import io.polaris.core.persistence.resolver.Resolver; -import io.polaris.core.persistence.resolver.ResolverStatus; -import io.polaris.service.catalog.api.IcebergRestCatalogApiService; -import io.polaris.service.catalog.api.IcebergRestConfigurationApiService; -import io.polaris.service.config.RealmEntityManagerFactory; -import io.polaris.service.context.CallContextCatalogFactory; -import io.polaris.service.types.CommitTableRequest; -import io.polaris.service.types.CommitViewRequest; -import io.polaris.service.types.NotificationRequest; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.SecurityContext; import java.net.URLEncoder; @@ -63,6 +47,22 @@ import org.apache.iceberg.rest.requests.UpdateNamespacePropertiesRequest; import org.apache.iceberg.rest.requests.UpdateTableRequest; import org.apache.iceberg.rest.responses.ConfigResponse; +import org.apache.polaris.core.auth.AuthenticatedPolarisPrincipal; +import org.apache.polaris.core.auth.PolarisAuthorizer; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.context.RealmContext; +import org.apache.polaris.core.entity.PolarisEntity; +import org.apache.polaris.core.persistence.PolarisEntityManager; +import org.apache.polaris.core.persistence.cache.EntityCacheEntry; +import org.apache.polaris.core.persistence.resolver.Resolver; +import org.apache.polaris.core.persistence.resolver.ResolverStatus; +import org.apache.polaris.service.catalog.api.IcebergRestCatalogApiService; +import org.apache.polaris.service.catalog.api.IcebergRestConfigurationApiService; +import org.apache.polaris.service.config.RealmEntityManagerFactory; +import org.apache.polaris.service.context.CallContextCatalogFactory; +import org.apache.polaris.service.types.CommitTableRequest; +import org.apache.polaris.service.types.CommitViewRequest; +import org.apache.polaris.service.types.NotificationRequest; /** * {@link IcebergRestCatalogApiService} implementation that delegates operations to {@link diff --git a/polaris-service/src/main/java/io/polaris/service/catalog/PolarisCatalogHandlerWrapper.java b/polaris-service/src/main/java/org/apache/polaris/service/catalog/PolarisCatalogHandlerWrapper.java similarity index 97% rename from polaris-service/src/main/java/io/polaris/service/catalog/PolarisCatalogHandlerWrapper.java rename to polaris-service/src/main/java/org/apache/polaris/service/catalog/PolarisCatalogHandlerWrapper.java index cda8fa627f..4595d1638a 100644 --- a/polaris-service/src/main/java/io/polaris/service/catalog/PolarisCatalogHandlerWrapper.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/catalog/PolarisCatalogHandlerWrapper.java @@ -16,25 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.catalog; +package org.apache.polaris.service.catalog; import com.google.common.collect.Maps; -import io.polaris.core.auth.AuthenticatedPolarisPrincipal; -import io.polaris.core.auth.PolarisAuthorizableOperation; -import io.polaris.core.auth.PolarisAuthorizer; -import io.polaris.core.catalog.PolarisCatalogHelpers; -import io.polaris.core.context.CallContext; -import io.polaris.core.entity.CatalogEntity; -import io.polaris.core.entity.PolarisEntitySubType; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.persistence.PolarisEntityManager; -import io.polaris.core.persistence.PolarisResolvedPathWrapper; -import io.polaris.core.persistence.resolver.PolarisResolutionManifest; -import io.polaris.core.persistence.resolver.ResolverPath; -import io.polaris.core.persistence.resolver.ResolverStatus; -import io.polaris.core.storage.PolarisStorageActions; -import io.polaris.service.context.CallContextCatalogFactory; -import io.polaris.service.types.NotificationRequest; import java.io.Closeable; import java.io.IOException; import java.time.OffsetDateTime; @@ -85,6 +69,22 @@ import org.apache.iceberg.rest.responses.LoadTableResponse; import org.apache.iceberg.rest.responses.LoadViewResponse; import org.apache.iceberg.rest.responses.UpdateNamespacePropertiesResponse; +import org.apache.polaris.core.auth.AuthenticatedPolarisPrincipal; +import org.apache.polaris.core.auth.PolarisAuthorizableOperation; +import org.apache.polaris.core.auth.PolarisAuthorizer; +import org.apache.polaris.core.catalog.PolarisCatalogHelpers; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.entity.CatalogEntity; +import org.apache.polaris.core.entity.PolarisEntitySubType; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.persistence.PolarisEntityManager; +import org.apache.polaris.core.persistence.PolarisResolvedPathWrapper; +import org.apache.polaris.core.persistence.resolver.PolarisResolutionManifest; +import org.apache.polaris.core.persistence.resolver.ResolverPath; +import org.apache.polaris.core.persistence.resolver.ResolverStatus; +import org.apache.polaris.core.storage.PolarisStorageActions; +import org.apache.polaris.service.context.CallContextCatalogFactory; +import org.apache.polaris.service.types.NotificationRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -455,7 +455,8 @@ public CreateNamespaceResponse createNamespace(CreateNamespaceRequest request) { } private static boolean isExternal(CatalogEntity catalog) { - return io.polaris.core.admin.model.Catalog.TypeEnum.EXTERNAL.equals(catalog.getCatalogType()); + return org.apache.polaris.core.admin.model.Catalog.TypeEnum.EXTERNAL.equals( + catalog.getCatalogType()); } private void doCatalogOperation(Runnable handler) { @@ -748,7 +749,9 @@ public boolean sendNotification(TableIdentifier identifier, NotificationRequest .getResolvedReferenceCatalogEntity() .getResolvedLeafEntity() .getEntity()); - if (catalog.getCatalogType().equals(io.polaris.core.admin.model.Catalog.TypeEnum.INTERNAL)) { + if (catalog + .getCatalogType() + .equals(org.apache.polaris.core.admin.model.Catalog.TypeEnum.INTERNAL)) { LOGGER .atWarn() .addKeyValue("catalog", catalog) diff --git a/polaris-service/src/main/java/io/polaris/service/catalog/SupportsCredentialDelegation.java b/polaris-service/src/main/java/org/apache/polaris/service/catalog/SupportsCredentialDelegation.java similarity index 93% rename from polaris-service/src/main/java/io/polaris/service/catalog/SupportsCredentialDelegation.java rename to polaris-service/src/main/java/org/apache/polaris/service/catalog/SupportsCredentialDelegation.java index b8a74e504d..554358765e 100644 --- a/polaris-service/src/main/java/io/polaris/service/catalog/SupportsCredentialDelegation.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/catalog/SupportsCredentialDelegation.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.catalog; +package org.apache.polaris.service.catalog; -import io.polaris.core.storage.PolarisStorageActions; import java.util.Map; import java.util.Set; import org.apache.iceberg.TableMetadata; import org.apache.iceberg.catalog.TableIdentifier; +import org.apache.polaris.core.storage.PolarisStorageActions; /** * Adds support for credential vending for (typically) {@link org.apache.iceberg.TableOperations} to diff --git a/polaris-service/src/main/java/io/polaris/service/catalog/SupportsNotifications.java b/polaris-service/src/main/java/org/apache/polaris/service/catalog/SupportsNotifications.java similarity index 90% rename from polaris-service/src/main/java/io/polaris/service/catalog/SupportsNotifications.java rename to polaris-service/src/main/java/org/apache/polaris/service/catalog/SupportsNotifications.java index 8f471e8156..525dfaaaef 100644 --- a/polaris-service/src/main/java/io/polaris/service/catalog/SupportsNotifications.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/catalog/SupportsNotifications.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.catalog; +package org.apache.polaris.service.catalog; -import io.polaris.service.types.NotificationRequest; import org.apache.iceberg.catalog.TableIdentifier; +import org.apache.polaris.service.types.NotificationRequest; public interface SupportsNotifications { diff --git a/polaris-service/src/main/java/io/polaris/service/config/ConfigurationStoreAware.java b/polaris-service/src/main/java/org/apache/polaris/service/config/ConfigurationStoreAware.java similarity index 90% rename from polaris-service/src/main/java/io/polaris/service/config/ConfigurationStoreAware.java rename to polaris-service/src/main/java/org/apache/polaris/service/config/ConfigurationStoreAware.java index eeb706bfc4..645f1b001b 100644 --- a/polaris-service/src/main/java/io/polaris/service/config/ConfigurationStoreAware.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/config/ConfigurationStoreAware.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.config; +package org.apache.polaris.service.config; -import io.polaris.core.PolarisConfigurationStore; +import org.apache.polaris.core.PolarisConfigurationStore; /** Interface allows injection of a {@link PolarisConfigurationStore} */ public interface ConfigurationStoreAware { diff --git a/polaris-service/src/main/java/io/polaris/service/config/CorsConfiguration.java b/polaris-service/src/main/java/org/apache/polaris/service/config/CorsConfiguration.java similarity index 98% rename from polaris-service/src/main/java/io/polaris/service/config/CorsConfiguration.java rename to polaris-service/src/main/java/org/apache/polaris/service/config/CorsConfiguration.java index 38b3171868..f1154ea7d3 100644 --- a/polaris-service/src/main/java/io/polaris/service/config/CorsConfiguration.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/config/CorsConfiguration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.config; +package org.apache.polaris.service.config; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; diff --git a/polaris-service/src/main/java/io/polaris/service/config/DefaultConfigurationStore.java b/polaris-service/src/main/java/org/apache/polaris/service/config/DefaultConfigurationStore.java similarity index 89% rename from polaris-service/src/main/java/io/polaris/service/config/DefaultConfigurationStore.java rename to polaris-service/src/main/java/org/apache/polaris/service/config/DefaultConfigurationStore.java index a767d0c8dc..82157fb99c 100644 --- a/polaris-service/src/main/java/io/polaris/service/config/DefaultConfigurationStore.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/config/DefaultConfigurationStore.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.config; +package org.apache.polaris.service.config; -import io.polaris.core.PolarisCallContext; -import io.polaris.core.PolarisConfigurationStore; import java.util.Map; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.PolarisConfigurationStore; import org.jetbrains.annotations.Nullable; public class DefaultConfigurationStore implements PolarisConfigurationStore { diff --git a/polaris-service/src/main/java/io/polaris/service/config/HasEntityManagerFactory.java b/polaris-service/src/main/java/org/apache/polaris/service/config/HasEntityManagerFactory.java similarity index 95% rename from polaris-service/src/main/java/io/polaris/service/config/HasEntityManagerFactory.java rename to polaris-service/src/main/java/org/apache/polaris/service/config/HasEntityManagerFactory.java index 13205b689d..935651df16 100644 --- a/polaris-service/src/main/java/io/polaris/service/config/HasEntityManagerFactory.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/config/HasEntityManagerFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.config; +package org.apache.polaris.service.config; public interface HasEntityManagerFactory { void setEntityManagerFactory(RealmEntityManagerFactory entityManagerFactory); diff --git a/polaris-service/src/main/java/io/polaris/service/config/OAuth2ApiService.java b/polaris-service/src/main/java/org/apache/polaris/service/config/OAuth2ApiService.java similarity index 86% rename from polaris-service/src/main/java/io/polaris/service/config/OAuth2ApiService.java rename to polaris-service/src/main/java/org/apache/polaris/service/config/OAuth2ApiService.java index 61132e808a..81c219afa0 100644 --- a/polaris-service/src/main/java/io/polaris/service/config/OAuth2ApiService.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/config/OAuth2ApiService.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.config; +package org.apache.polaris.service.config; import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.dropwizard.jackson.Discoverable; -import io.polaris.service.auth.TokenBrokerFactory; -import io.polaris.service.catalog.api.IcebergRestOAuth2ApiService; +import org.apache.polaris.service.auth.TokenBrokerFactory; +import org.apache.polaris.service.catalog.api.IcebergRestOAuth2ApiService; @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") public interface OAuth2ApiService extends Discoverable, IcebergRestOAuth2ApiService { diff --git a/polaris-service/src/main/java/io/polaris/service/config/PolarisApplicationConfig.java b/polaris-service/src/main/java/org/apache/polaris/service/config/PolarisApplicationConfig.java similarity index 92% rename from polaris-service/src/main/java/io/polaris/service/config/PolarisApplicationConfig.java rename to polaris-service/src/main/java/org/apache/polaris/service/config/PolarisApplicationConfig.java index ba87aff0fd..c205198b50 100644 --- a/polaris-service/src/main/java/io/polaris/service/config/PolarisApplicationConfig.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/config/PolarisApplicationConfig.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.config; +package org.apache.polaris.service.config; import com.fasterxml.jackson.annotation.JsonProperty; import io.dropwizard.core.Configuration; -import io.polaris.core.PolarisConfigurationStore; -import io.polaris.core.auth.AuthenticatedPolarisPrincipal; -import io.polaris.core.persistence.MetaStoreManagerFactory; -import io.polaris.service.auth.DiscoverableAuthenticator; -import io.polaris.service.context.CallContextResolver; -import io.polaris.service.context.RealmContextResolver; import java.util.HashMap; import java.util.List; import java.util.Map; import org.apache.commons.lang3.StringUtils; +import org.apache.polaris.core.PolarisConfigurationStore; +import org.apache.polaris.core.auth.AuthenticatedPolarisPrincipal; +import org.apache.polaris.core.persistence.MetaStoreManagerFactory; +import org.apache.polaris.service.auth.DiscoverableAuthenticator; +import org.apache.polaris.service.context.CallContextResolver; +import org.apache.polaris.service.context.RealmContextResolver; import org.slf4j.LoggerFactory; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider; diff --git a/polaris-service/src/main/java/io/polaris/service/config/RealmEntityManagerFactory.java b/polaris-service/src/main/java/org/apache/polaris/service/config/RealmEntityManagerFactory.java similarity index 91% rename from polaris-service/src/main/java/io/polaris/service/config/RealmEntityManagerFactory.java rename to polaris-service/src/main/java/org/apache/polaris/service/config/RealmEntityManagerFactory.java index 302d6225fb..3a8bc93e25 100644 --- a/polaris-service/src/main/java/io/polaris/service/config/RealmEntityManagerFactory.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/config/RealmEntityManagerFactory.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.config; +package org.apache.polaris.service.config; -import io.polaris.core.context.RealmContext; -import io.polaris.core.persistence.MetaStoreManagerFactory; -import io.polaris.core.persistence.PolarisEntityManager; import java.util.HashMap; import java.util.Map; +import org.apache.polaris.core.context.RealmContext; +import org.apache.polaris.core.persistence.MetaStoreManagerFactory; +import org.apache.polaris.core.persistence.PolarisEntityManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/polaris-service/src/main/java/io/polaris/service/config/Serializers.java b/polaris-service/src/main/java/org/apache/polaris/service/config/Serializers.java similarity index 91% rename from polaris-service/src/main/java/io/polaris/service/config/Serializers.java rename to polaris-service/src/main/java/org/apache/polaris/service/config/Serializers.java index ed783f63f7..a2a84eef6e 100644 --- a/polaris-service/src/main/java/io/polaris/service/config/Serializers.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/config/Serializers.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.config; +package org.apache.polaris.service.config; import com.fasterxml.jackson.core.JacksonException; import com.fasterxml.jackson.core.JsonParser; @@ -27,20 +27,20 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.node.ObjectNode; -import io.polaris.core.admin.model.AddGrantRequest; -import io.polaris.core.admin.model.Catalog; -import io.polaris.core.admin.model.CatalogRole; -import io.polaris.core.admin.model.CreateCatalogRequest; -import io.polaris.core.admin.model.CreateCatalogRoleRequest; -import io.polaris.core.admin.model.CreatePrincipalRequest; -import io.polaris.core.admin.model.CreatePrincipalRoleRequest; -import io.polaris.core.admin.model.GrantCatalogRoleRequest; -import io.polaris.core.admin.model.GrantPrincipalRoleRequest; -import io.polaris.core.admin.model.GrantResource; -import io.polaris.core.admin.model.Principal; -import io.polaris.core.admin.model.PrincipalRole; -import io.polaris.core.admin.model.RevokeGrantRequest; import java.io.IOException; +import org.apache.polaris.core.admin.model.AddGrantRequest; +import org.apache.polaris.core.admin.model.Catalog; +import org.apache.polaris.core.admin.model.CatalogRole; +import org.apache.polaris.core.admin.model.CreateCatalogRequest; +import org.apache.polaris.core.admin.model.CreateCatalogRoleRequest; +import org.apache.polaris.core.admin.model.CreatePrincipalRequest; +import org.apache.polaris.core.admin.model.CreatePrincipalRoleRequest; +import org.apache.polaris.core.admin.model.GrantCatalogRoleRequest; +import org.apache.polaris.core.admin.model.GrantPrincipalRoleRequest; +import org.apache.polaris.core.admin.model.GrantResource; +import org.apache.polaris.core.admin.model.Principal; +import org.apache.polaris.core.admin.model.PrincipalRole; +import org.apache.polaris.core.admin.model.RevokeGrantRequest; public final class Serializers { private Serializers() {} diff --git a/polaris-service/src/main/java/io/polaris/service/config/TaskHandlerConfiguration.java b/polaris-service/src/main/java/org/apache/polaris/service/config/TaskHandlerConfiguration.java similarity index 97% rename from polaris-service/src/main/java/io/polaris/service/config/TaskHandlerConfiguration.java rename to polaris-service/src/main/java/org/apache/polaris/service/config/TaskHandlerConfiguration.java index 5d7df1a7ca..fee41e71b9 100644 --- a/polaris-service/src/main/java/io/polaris/service/config/TaskHandlerConfiguration.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/config/TaskHandlerConfiguration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.config; +package org.apache.polaris.service.config; import com.google.common.util.concurrent.ThreadFactoryBuilder; import java.util.concurrent.ExecutorService; diff --git a/polaris-service/src/main/java/io/polaris/service/context/CallContextCatalogFactory.java b/polaris-service/src/main/java/org/apache/polaris/service/context/CallContextCatalogFactory.java similarity index 81% rename from polaris-service/src/main/java/io/polaris/service/context/CallContextCatalogFactory.java rename to polaris-service/src/main/java/org/apache/polaris/service/context/CallContextCatalogFactory.java index 8cd155e81e..24551a2d01 100644 --- a/polaris-service/src/main/java/io/polaris/service/context/CallContextCatalogFactory.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/context/CallContextCatalogFactory.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.context; +package org.apache.polaris.service.context; -import io.polaris.core.auth.AuthenticatedPolarisPrincipal; -import io.polaris.core.context.CallContext; -import io.polaris.core.persistence.resolver.PolarisResolutionManifest; import org.apache.iceberg.catalog.Catalog; +import org.apache.polaris.core.auth.AuthenticatedPolarisPrincipal; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.persistence.resolver.PolarisResolutionManifest; public interface CallContextCatalogFactory { Catalog createCallContextCatalog( diff --git a/polaris-service/src/main/java/io/polaris/service/context/CallContextResolver.java b/polaris-service/src/main/java/org/apache/polaris/service/context/CallContextResolver.java similarity index 86% rename from polaris-service/src/main/java/io/polaris/service/context/CallContextResolver.java rename to polaris-service/src/main/java/org/apache/polaris/service/context/CallContextResolver.java index 544d803ecc..2c2863de37 100644 --- a/polaris-service/src/main/java/io/polaris/service/context/CallContextResolver.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/context/CallContextResolver.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.context; +package org.apache.polaris.service.context; import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.dropwizard.jackson.Discoverable; -import io.polaris.core.context.CallContext; -import io.polaris.core.context.RealmContext; -import io.polaris.service.config.HasEntityManagerFactory; import java.util.Map; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.context.RealmContext; +import org.apache.polaris.service.config.HasEntityManagerFactory; /** Uses the resolved RealmContext to further resolve elements of the CallContext. */ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") diff --git a/polaris-service/src/main/java/io/polaris/service/context/DefaultContextResolver.java b/polaris-service/src/main/java/org/apache/polaris/service/context/DefaultContextResolver.java similarity index 90% rename from polaris-service/src/main/java/io/polaris/service/context/DefaultContextResolver.java rename to polaris-service/src/main/java/org/apache/polaris/service/context/DefaultContextResolver.java index 2d602a0392..b171a59811 100644 --- a/polaris-service/src/main/java/io/polaris/service/context/DefaultContextResolver.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/context/DefaultContextResolver.java @@ -16,24 +16,24 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.context; +package org.apache.polaris.service.context; import com.fasterxml.jackson.annotation.JsonTypeName; import com.google.common.base.Splitter; -import io.polaris.core.PolarisCallContext; -import io.polaris.core.PolarisConfigurationStore; -import io.polaris.core.PolarisDefaultDiagServiceImpl; -import io.polaris.core.PolarisDiagnostics; -import io.polaris.core.context.CallContext; -import io.polaris.core.context.RealmContext; -import io.polaris.core.persistence.PolarisEntityManager; -import io.polaris.core.persistence.PolarisMetaStoreSession; -import io.polaris.service.config.ConfigurationStoreAware; -import io.polaris.service.config.RealmEntityManagerFactory; import java.time.Clock; import java.time.ZoneId; import java.util.HashMap; import java.util.Map; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.PolarisConfigurationStore; +import org.apache.polaris.core.PolarisDefaultDiagServiceImpl; +import org.apache.polaris.core.PolarisDiagnostics; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.context.RealmContext; +import org.apache.polaris.core.persistence.PolarisEntityManager; +import org.apache.polaris.core.persistence.PolarisMetaStoreSession; +import org.apache.polaris.service.config.ConfigurationStoreAware; +import org.apache.polaris.service.config.RealmEntityManagerFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/polaris-service/src/main/java/io/polaris/service/context/PolarisCallContextCatalogFactory.java b/polaris-service/src/main/java/org/apache/polaris/service/context/PolarisCallContextCatalogFactory.java similarity index 85% rename from polaris-service/src/main/java/io/polaris/service/context/PolarisCallContextCatalogFactory.java rename to polaris-service/src/main/java/org/apache/polaris/service/context/PolarisCallContextCatalogFactory.java index 14bdf86d3d..f82e72315b 100644 --- a/polaris-service/src/main/java/io/polaris/service/context/PolarisCallContextCatalogFactory.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/context/PolarisCallContextCatalogFactory.java @@ -16,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.context; +package org.apache.polaris.service.context; -import io.polaris.core.auth.AuthenticatedPolarisPrincipal; -import io.polaris.core.context.CallContext; -import io.polaris.core.entity.CatalogEntity; -import io.polaris.core.entity.PolarisBaseEntity; -import io.polaris.core.persistence.PolarisEntityManager; -import io.polaris.core.persistence.resolver.PolarisResolutionManifest; -import io.polaris.service.catalog.BasePolarisCatalog; -import io.polaris.service.config.RealmEntityManagerFactory; -import io.polaris.service.task.TaskExecutor; import java.nio.file.Paths; import java.util.HashMap; import java.util.Map; import java.util.Objects; import org.apache.iceberg.CatalogProperties; import org.apache.iceberg.catalog.Catalog; +import org.apache.polaris.core.auth.AuthenticatedPolarisPrincipal; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.entity.CatalogEntity; +import org.apache.polaris.core.entity.PolarisBaseEntity; +import org.apache.polaris.core.persistence.PolarisEntityManager; +import org.apache.polaris.core.persistence.resolver.PolarisResolutionManifest; +import org.apache.polaris.service.catalog.BasePolarisCatalog; +import org.apache.polaris.service.config.RealmEntityManagerFactory; +import org.apache.polaris.service.task.TaskExecutor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/polaris-service/src/main/java/io/polaris/service/context/RealmContextResolver.java b/polaris-service/src/main/java/org/apache/polaris/service/context/RealmContextResolver.java similarity index 88% rename from polaris-service/src/main/java/io/polaris/service/context/RealmContextResolver.java rename to polaris-service/src/main/java/org/apache/polaris/service/context/RealmContextResolver.java index cc1f9a561d..14759431de 100644 --- a/polaris-service/src/main/java/io/polaris/service/context/RealmContextResolver.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/context/RealmContextResolver.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.context; +package org.apache.polaris.service.context; import com.fasterxml.jackson.annotation.JsonTypeInfo; import io.dropwizard.jackson.Discoverable; -import io.polaris.core.context.RealmContext; -import io.polaris.service.config.HasEntityManagerFactory; import java.util.Map; +import org.apache.polaris.core.context.RealmContext; +import org.apache.polaris.service.config.HasEntityManagerFactory; @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") public interface RealmContextResolver extends Discoverable, HasEntityManagerFactory { diff --git a/polaris-service/src/main/java/io/polaris/service/logging/PolarisJsonLayoutFactory.java b/polaris-service/src/main/java/org/apache/polaris/service/logging/PolarisJsonLayoutFactory.java similarity index 99% rename from polaris-service/src/main/java/io/polaris/service/logging/PolarisJsonLayoutFactory.java rename to polaris-service/src/main/java/org/apache/polaris/service/logging/PolarisJsonLayoutFactory.java index fbcbe1846c..476c5a9979 100644 --- a/polaris-service/src/main/java/io/polaris/service/logging/PolarisJsonLayoutFactory.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/logging/PolarisJsonLayoutFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.logging; +package org.apache.polaris.service.logging; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.pattern.ExtendedThrowableProxyConverter; diff --git a/polaris-service/src/main/java/io/polaris/service/persistence/InMemoryPolarisMetaStoreManagerFactory.java b/polaris-service/src/main/java/org/apache/polaris/service/persistence/InMemoryPolarisMetaStoreManagerFactory.java similarity index 85% rename from polaris-service/src/main/java/io/polaris/service/persistence/InMemoryPolarisMetaStoreManagerFactory.java rename to polaris-service/src/main/java/org/apache/polaris/service/persistence/InMemoryPolarisMetaStoreManagerFactory.java index 322629714d..1d58a1eb58 100644 --- a/polaris-service/src/main/java/io/polaris/service/persistence/InMemoryPolarisMetaStoreManagerFactory.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/persistence/InMemoryPolarisMetaStoreManagerFactory.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.persistence; +package org.apache.polaris.service.persistence; import com.fasterxml.jackson.annotation.JsonTypeName; -import io.polaris.core.PolarisDiagnostics; -import io.polaris.core.context.RealmContext; -import io.polaris.core.persistence.LocalPolarisMetaStoreManagerFactory; -import io.polaris.core.persistence.PolarisMetaStoreManager; -import io.polaris.core.persistence.PolarisMetaStoreSession; -import io.polaris.core.persistence.PolarisTreeMapMetaStoreSessionImpl; -import io.polaris.core.persistence.PolarisTreeMapStore; import java.util.Collections; import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.function.Supplier; +import org.apache.polaris.core.PolarisDiagnostics; +import org.apache.polaris.core.context.RealmContext; +import org.apache.polaris.core.persistence.LocalPolarisMetaStoreManagerFactory; +import org.apache.polaris.core.persistence.PolarisMetaStoreManager; +import org.apache.polaris.core.persistence.PolarisMetaStoreSession; +import org.apache.polaris.core.persistence.PolarisTreeMapMetaStoreSessionImpl; +import org.apache.polaris.core.persistence.PolarisTreeMapStore; import org.jetbrains.annotations.NotNull; @JsonTypeName("in-memory") diff --git a/polaris-service/src/main/java/io/polaris/service/resource/TimedApi.java b/polaris-service/src/main/java/org/apache/polaris/service/resource/TimedApi.java similarity index 84% rename from polaris-service/src/main/java/io/polaris/service/resource/TimedApi.java rename to polaris-service/src/main/java/org/apache/polaris/service/resource/TimedApi.java index dbba4431fc..a1cbc5799e 100644 --- a/polaris-service/src/main/java/io/polaris/service/resource/TimedApi.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/resource/TimedApi.java @@ -16,17 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.resource; +package org.apache.polaris.service.resource; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.apache.polaris.service.TimedApplicationEventListener; /** * Annotation to mark methods for timing API calls and counting errors. The backing logic is - * controlled by {@link io.polaris.service.TimedApplicationEventListener}, therefore this annotation - * is only effective for Jersey resource methods. + * controlled by {@link TimedApplicationEventListener}, therefore this annotation is only effective + * for Jersey resource methods. */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) diff --git a/polaris-service/src/main/java/io/polaris/service/storage/PolarisStorageIntegrationProviderImpl.java b/polaris-service/src/main/java/org/apache/polaris/service/storage/PolarisStorageIntegrationProviderImpl.java similarity index 86% rename from polaris-service/src/main/java/io/polaris/service/storage/PolarisStorageIntegrationProviderImpl.java rename to polaris-service/src/main/java/org/apache/polaris/service/storage/PolarisStorageIntegrationProviderImpl.java index 9d6165372a..518ed2b972 100644 --- a/polaris-service/src/main/java/io/polaris/service/storage/PolarisStorageIntegrationProviderImpl.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/storage/PolarisStorageIntegrationProviderImpl.java @@ -16,26 +16,26 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.storage; +package org.apache.polaris.service.storage; import com.google.api.client.http.javanet.NetHttpTransport; import com.google.auth.http.HttpTransportFactory; import com.google.auth.oauth2.GoogleCredentials; import com.google.cloud.ServiceOptions; -import io.polaris.core.PolarisDiagnostics; -import io.polaris.core.storage.PolarisCredentialProperty; -import io.polaris.core.storage.PolarisStorageActions; -import io.polaris.core.storage.PolarisStorageConfigurationInfo; -import io.polaris.core.storage.PolarisStorageIntegration; -import io.polaris.core.storage.PolarisStorageIntegrationProvider; -import io.polaris.core.storage.aws.AwsCredentialsStorageIntegration; -import io.polaris.core.storage.azure.AzureCredentialsStorageIntegration; -import io.polaris.core.storage.gcp.GcpCredentialsStorageIntegration; import java.io.IOException; import java.util.EnumMap; import java.util.Map; import java.util.Set; import java.util.function.Supplier; +import org.apache.polaris.core.PolarisDiagnostics; +import org.apache.polaris.core.storage.PolarisCredentialProperty; +import org.apache.polaris.core.storage.PolarisStorageActions; +import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo; +import org.apache.polaris.core.storage.PolarisStorageIntegration; +import org.apache.polaris.core.storage.PolarisStorageIntegrationProvider; +import org.apache.polaris.core.storage.aws.AwsCredentialsStorageIntegration; +import org.apache.polaris.core.storage.azure.AzureCredentialsStorageIntegration; +import org.apache.polaris.core.storage.gcp.GcpCredentialsStorageIntegration; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import software.amazon.awssdk.services.sts.StsClient; diff --git a/polaris-service/src/main/java/io/polaris/service/task/ManifestFileCleanupTaskHandler.java b/polaris-service/src/main/java/org/apache/polaris/service/task/ManifestFileCleanupTaskHandler.java similarity index 98% rename from polaris-service/src/main/java/io/polaris/service/task/ManifestFileCleanupTaskHandler.java rename to polaris-service/src/main/java/org/apache/polaris/service/task/ManifestFileCleanupTaskHandler.java index e55d55b46f..e17e24fd7b 100644 --- a/polaris-service/src/main/java/io/polaris/service/task/ManifestFileCleanupTaskHandler.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/task/ManifestFileCleanupTaskHandler.java @@ -16,10 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.task; +package org.apache.polaris.service.task; -import io.polaris.core.entity.AsyncTaskType; -import io.polaris.core.entity.TaskEntity; import java.io.IOException; import java.util.List; import java.util.Objects; @@ -38,6 +36,8 @@ import org.apache.iceberg.ManifestReader; import org.apache.iceberg.catalog.TableIdentifier; import org.apache.iceberg.io.FileIO; +import org.apache.polaris.core.entity.AsyncTaskType; +import org.apache.polaris.core.entity.TaskEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/polaris-service/src/main/java/io/polaris/service/task/TableCleanupTaskHandler.java b/polaris-service/src/main/java/org/apache/polaris/service/task/TableCleanupTaskHandler.java similarity index 92% rename from polaris-service/src/main/java/io/polaris/service/task/TableCleanupTaskHandler.java rename to polaris-service/src/main/java/org/apache/polaris/service/task/TableCleanupTaskHandler.java index 2c587af976..7f323174b1 100644 --- a/polaris-service/src/main/java/io/polaris/service/task/TableCleanupTaskHandler.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/task/TableCleanupTaskHandler.java @@ -16,18 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.task; +package org.apache.polaris.service.task; -import io.polaris.core.PolarisCallContext; -import io.polaris.core.context.CallContext; -import io.polaris.core.entity.AsyncTaskType; -import io.polaris.core.entity.PolarisBaseEntity; -import io.polaris.core.entity.PolarisEntity; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.entity.TableLikeEntity; -import io.polaris.core.entity.TaskEntity; -import io.polaris.core.persistence.MetaStoreManagerFactory; -import io.polaris.core.persistence.PolarisMetaStoreManager; import java.util.List; import java.util.UUID; import java.util.function.Function; @@ -36,6 +26,16 @@ import org.apache.iceberg.TableMetadata; import org.apache.iceberg.TableMetadataParser; import org.apache.iceberg.io.FileIO; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.entity.AsyncTaskType; +import org.apache.polaris.core.entity.PolarisBaseEntity; +import org.apache.polaris.core.entity.PolarisEntity; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.entity.TableLikeEntity; +import org.apache.polaris.core.entity.TaskEntity; +import org.apache.polaris.core.persistence.MetaStoreManagerFactory; +import org.apache.polaris.core.persistence.PolarisMetaStoreManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/polaris-service/src/main/java/io/polaris/service/task/TaskExecutor.java b/polaris-service/src/main/java/org/apache/polaris/service/task/TaskExecutor.java similarity index 92% rename from polaris-service/src/main/java/io/polaris/service/task/TaskExecutor.java rename to polaris-service/src/main/java/org/apache/polaris/service/task/TaskExecutor.java index 58535eae59..016518e6fe 100644 --- a/polaris-service/src/main/java/io/polaris/service/task/TaskExecutor.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/task/TaskExecutor.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.task; +package org.apache.polaris.service.task; -import io.polaris.core.context.CallContext; +import org.apache.polaris.core.context.CallContext; /** * Execute a task asynchronously with a provided context. The context must be cloned so that callers diff --git a/polaris-service/src/main/java/io/polaris/service/task/TaskExecutorImpl.java b/polaris-service/src/main/java/org/apache/polaris/service/task/TaskExecutorImpl.java similarity index 92% rename from polaris-service/src/main/java/io/polaris/service/task/TaskExecutorImpl.java rename to polaris-service/src/main/java/org/apache/polaris/service/task/TaskExecutorImpl.java index e0b11afcf9..e3a227f4e9 100644 --- a/polaris-service/src/main/java/io/polaris/service/task/TaskExecutorImpl.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/task/TaskExecutorImpl.java @@ -16,15 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.task; +package org.apache.polaris.service.task; -import io.polaris.core.context.CallContext; -import io.polaris.core.entity.PolarisBaseEntity; -import io.polaris.core.entity.PolarisEntity; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.entity.TaskEntity; -import io.polaris.core.persistence.MetaStoreManagerFactory; -import io.polaris.core.persistence.PolarisMetaStoreManager; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -32,6 +25,13 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.entity.PolarisBaseEntity; +import org.apache.polaris.core.entity.PolarisEntity; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.entity.TaskEntity; +import org.apache.polaris.core.persistence.MetaStoreManagerFactory; +import org.apache.polaris.core.persistence.PolarisMetaStoreManager; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/polaris-service/src/main/java/io/polaris/service/task/TaskFileIOSupplier.java b/polaris-service/src/main/java/org/apache/polaris/service/task/TaskFileIOSupplier.java similarity index 87% rename from polaris-service/src/main/java/io/polaris/service/task/TaskFileIOSupplier.java rename to polaris-service/src/main/java/org/apache/polaris/service/task/TaskFileIOSupplier.java index ea09daa4ce..7b636d5630 100644 --- a/polaris-service/src/main/java/io/polaris/service/task/TaskFileIOSupplier.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/task/TaskFileIOSupplier.java @@ -16,13 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.task; +package org.apache.polaris.service.task; -import io.polaris.core.context.CallContext; -import io.polaris.core.entity.PolarisTaskConstants; -import io.polaris.core.entity.TaskEntity; -import io.polaris.core.persistence.MetaStoreManagerFactory; -import io.polaris.core.persistence.PolarisMetaStoreManager; import java.util.HashMap; import java.util.Map; import java.util.Set; @@ -31,6 +26,11 @@ import org.apache.iceberg.CatalogProperties; import org.apache.iceberg.CatalogUtil; import org.apache.iceberg.io.FileIO; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.entity.PolarisTaskConstants; +import org.apache.polaris.core.entity.TaskEntity; +import org.apache.polaris.core.persistence.MetaStoreManagerFactory; +import org.apache.polaris.core.persistence.PolarisMetaStoreManager; public class TaskFileIOSupplier implements Function { private final MetaStoreManagerFactory metaStoreManagerFactory; diff --git a/polaris-service/src/main/java/io/polaris/service/task/TaskHandler.java b/polaris-service/src/main/java/org/apache/polaris/service/task/TaskHandler.java similarity index 91% rename from polaris-service/src/main/java/io/polaris/service/task/TaskHandler.java rename to polaris-service/src/main/java/org/apache/polaris/service/task/TaskHandler.java index b590c3dc19..f903ddf809 100644 --- a/polaris-service/src/main/java/io/polaris/service/task/TaskHandler.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/task/TaskHandler.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.task; +package org.apache.polaris.service.task; -import io.polaris.core.entity.TaskEntity; +import org.apache.polaris.core.entity.TaskEntity; public interface TaskHandler { boolean canHandleTask(TaskEntity task); diff --git a/polaris-service/src/main/java/io/polaris/service/task/TaskUtils.java b/polaris-service/src/main/java/org/apache/polaris/service/task/TaskUtils.java similarity index 97% rename from polaris-service/src/main/java/io/polaris/service/task/TaskUtils.java rename to polaris-service/src/main/java/org/apache/polaris/service/task/TaskUtils.java index 632ecbe249..7c1de08bed 100644 --- a/polaris-service/src/main/java/io/polaris/service/task/TaskUtils.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/task/TaskUtils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.task; +package org.apache.polaris.service.task; import java.io.IOException; import org.apache.commons.codec.binary.Base64; diff --git a/polaris-service/src/main/java/io/polaris/service/tracing/HeadersMapAccessor.java b/polaris-service/src/main/java/org/apache/polaris/service/tracing/HeadersMapAccessor.java similarity index 97% rename from polaris-service/src/main/java/io/polaris/service/tracing/HeadersMapAccessor.java rename to polaris-service/src/main/java/org/apache/polaris/service/tracing/HeadersMapAccessor.java index fbe0351790..44f52ffb0d 100644 --- a/polaris-service/src/main/java/io/polaris/service/tracing/HeadersMapAccessor.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/tracing/HeadersMapAccessor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.tracing; +package org.apache.polaris.service.tracing; import io.opentelemetry.context.propagation.TextMapGetter; import io.opentelemetry.context.propagation.TextMapSetter; diff --git a/polaris-service/src/main/java/io/polaris/service/tracing/OpenTelemetryAware.java b/polaris-service/src/main/java/org/apache/polaris/service/tracing/OpenTelemetryAware.java similarity index 95% rename from polaris-service/src/main/java/io/polaris/service/tracing/OpenTelemetryAware.java rename to polaris-service/src/main/java/org/apache/polaris/service/tracing/OpenTelemetryAware.java index 3f37092552..07a24e29c7 100644 --- a/polaris-service/src/main/java/io/polaris/service/tracing/OpenTelemetryAware.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/tracing/OpenTelemetryAware.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.tracing; +package org.apache.polaris.service.tracing; import io.opentelemetry.api.OpenTelemetry; diff --git a/polaris-service/src/main/java/io/polaris/service/tracing/TracingFilter.java b/polaris-service/src/main/java/org/apache/polaris/service/tracing/TracingFilter.java similarity index 97% rename from polaris-service/src/main/java/io/polaris/service/tracing/TracingFilter.java rename to polaris-service/src/main/java/org/apache/polaris/service/tracing/TracingFilter.java index 03804054cf..94934dd450 100644 --- a/polaris-service/src/main/java/io/polaris/service/tracing/TracingFilter.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/tracing/TracingFilter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.tracing; +package org.apache.polaris.service.tracing; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.api.trace.Span; @@ -27,7 +27,6 @@ import io.opentelemetry.semconv.HttpAttributes; import io.opentelemetry.semconv.ServerAttributes; import io.opentelemetry.semconv.UrlAttributes; -import io.polaris.core.context.CallContext; import jakarta.annotation.Priority; import jakarta.servlet.Filter; import jakarta.servlet.FilterChain; @@ -37,6 +36,7 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.ws.rs.Priorities; import java.io.IOException; +import org.apache.polaris.core.context.CallContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.MDC; diff --git a/polaris-service/src/main/java/io/polaris/service/types/CommitTableRequest.java b/polaris-service/src/main/java/org/apache/polaris/service/types/CommitTableRequest.java similarity index 95% rename from polaris-service/src/main/java/io/polaris/service/types/CommitTableRequest.java rename to polaris-service/src/main/java/org/apache/polaris/service/types/CommitTableRequest.java index 857c76830f..3d36f923e3 100644 --- a/polaris-service/src/main/java/io/polaris/service/types/CommitTableRequest.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/types/CommitTableRequest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.types; +package org.apache.polaris.service.types; import org.apache.iceberg.rest.requests.UpdateTableRequest; diff --git a/polaris-service/src/main/java/io/polaris/service/types/CommitViewRequest.java b/polaris-service/src/main/java/org/apache/polaris/service/types/CommitViewRequest.java similarity index 95% rename from polaris-service/src/main/java/io/polaris/service/types/CommitViewRequest.java rename to polaris-service/src/main/java/org/apache/polaris/service/types/CommitViewRequest.java index 2422c0f438..b6f623b65b 100644 --- a/polaris-service/src/main/java/io/polaris/service/types/CommitViewRequest.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/types/CommitViewRequest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.types; +package org.apache.polaris.service.types; import org.apache.iceberg.rest.requests.UpdateTableRequest; diff --git a/polaris-service/src/main/java/io/polaris/service/types/NotificationRequest.java b/polaris-service/src/main/java/org/apache/polaris/service/types/NotificationRequest.java similarity index 98% rename from polaris-service/src/main/java/io/polaris/service/types/NotificationRequest.java rename to polaris-service/src/main/java/org/apache/polaris/service/types/NotificationRequest.java index b689fd67f1..c73304bf84 100644 --- a/polaris-service/src/main/java/io/polaris/service/types/NotificationRequest.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/types/NotificationRequest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.types; +package org.apache.polaris.service.types; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; diff --git a/polaris-service/src/main/java/io/polaris/service/types/NotificationType.java b/polaris-service/src/main/java/org/apache/polaris/service/types/NotificationType.java similarity index 98% rename from polaris-service/src/main/java/io/polaris/service/types/NotificationType.java rename to polaris-service/src/main/java/org/apache/polaris/service/types/NotificationType.java index d95ecb368c..3189a59a7c 100644 --- a/polaris-service/src/main/java/io/polaris/service/types/NotificationType.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/types/NotificationType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.types; +package org.apache.polaris.service.types; import java.util.Arrays; import java.util.Locale; diff --git a/polaris-service/src/main/java/io/polaris/service/types/TableUpdateNotification.java b/polaris-service/src/main/java/org/apache/polaris/service/types/TableUpdateNotification.java similarity index 99% rename from polaris-service/src/main/java/io/polaris/service/types/TableUpdateNotification.java rename to polaris-service/src/main/java/org/apache/polaris/service/types/TableUpdateNotification.java index 891b82e89e..4a63268722 100644 --- a/polaris-service/src/main/java/io/polaris/service/types/TableUpdateNotification.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/types/TableUpdateNotification.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.types; +package org.apache.polaris.service.types; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; diff --git a/polaris-service/src/main/java/io/polaris/service/types/TokenType.java b/polaris-service/src/main/java/org/apache/polaris/service/types/TokenType.java similarity index 97% rename from polaris-service/src/main/java/io/polaris/service/types/TokenType.java rename to polaris-service/src/main/java/org/apache/polaris/service/types/TokenType.java index d5297834a5..1ef42c6701 100644 --- a/polaris-service/src/main/java/io/polaris/service/types/TokenType.java +++ b/polaris-service/src/main/java/org/apache/polaris/service/types/TokenType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.types; +package org.apache.polaris.service.types; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/polaris-service/src/main/resources/META-INF/services/io.dropwizard.jackson.Discoverable b/polaris-service/src/main/resources/META-INF/services/io.dropwizard.jackson.Discoverable index b7d7b8cfe8..cf170d6453 100644 --- a/polaris-service/src/main/resources/META-INF/services/io.dropwizard.jackson.Discoverable +++ b/polaris-service/src/main/resources/META-INF/services/io.dropwizard.jackson.Discoverable @@ -17,9 +17,9 @@ # under the License. # -io.polaris.service.auth.DiscoverableAuthenticator -io.polaris.core.persistence.MetaStoreManagerFactory -io.polaris.service.config.OAuth2ApiService -io.polaris.service.context.RealmContextResolver -io.polaris.service.context.CallContextResolver -io.polaris.service.auth.TokenBrokerFactory \ No newline at end of file +org.apache.polaris.service.auth.DiscoverableAuthenticator +org.apache.polaris.core.persistence.MetaStoreManagerFactory +org.apache.polaris.service.config.OAuth2ApiService +org.apache.polaris.service.context.RealmContextResolver +org.apache.polaris.service.context.CallContextResolver +org.apache.polaris.service.auth.TokenBrokerFactory \ No newline at end of file diff --git a/polaris-service/src/main/resources/META-INF/services/io.dropwizard.logging.common.layout.DiscoverableLayoutFactory b/polaris-service/src/main/resources/META-INF/services/io.dropwizard.logging.common.layout.DiscoverableLayoutFactory index d088bf51c2..aa766ac700 100644 --- a/polaris-service/src/main/resources/META-INF/services/io.dropwizard.logging.common.layout.DiscoverableLayoutFactory +++ b/polaris-service/src/main/resources/META-INF/services/io.dropwizard.logging.common.layout.DiscoverableLayoutFactory @@ -17,4 +17,4 @@ # under the License. # -io.polaris.service.logging.PolarisJsonLayoutFactory \ No newline at end of file +org.apache.polaris.service.logging.PolarisJsonLayoutFactory \ No newline at end of file diff --git a/polaris-service/src/main/resources/META-INF/services/io.polaris.core.persistence.MetaStoreManagerFactory b/polaris-service/src/main/resources/META-INF/services/org.apache.polaris.core.persistence.MetaStoreManagerFactory similarity index 81% rename from polaris-service/src/main/resources/META-INF/services/io.polaris.core.persistence.MetaStoreManagerFactory rename to polaris-service/src/main/resources/META-INF/services/org.apache.polaris.core.persistence.MetaStoreManagerFactory index 55626b47ec..85ae92caf8 100644 --- a/polaris-service/src/main/resources/META-INF/services/io.polaris.core.persistence.MetaStoreManagerFactory +++ b/polaris-service/src/main/resources/META-INF/services/org.apache.polaris.core.persistence.MetaStoreManagerFactory @@ -17,5 +17,5 @@ # under the License. # -io.polaris.service.persistence.InMemoryPolarisMetaStoreManagerFactory -io.polaris.extension.persistence.impl.eclipselink.EclipseLinkPolarisMetaStoreManagerFactory +org.apache.polaris.service.persistence.InMemoryPolarisMetaStoreManagerFactory +org.apache.polaris.extension.persistence.impl.eclipselink.EclipseLinkPolarisMetaStoreManagerFactory diff --git a/polaris-service/src/main/resources/META-INF/services/io.polaris.service.auth.TokenBrokerFactory b/polaris-service/src/main/resources/META-INF/services/org.apache.polaris.service.auth.TokenBrokerFactory similarity index 88% rename from polaris-service/src/main/resources/META-INF/services/io.polaris.service.auth.TokenBrokerFactory rename to polaris-service/src/main/resources/META-INF/services/org.apache.polaris.service.auth.TokenBrokerFactory index f1084dbeaa..422b154c77 100644 --- a/polaris-service/src/main/resources/META-INF/services/io.polaris.service.auth.TokenBrokerFactory +++ b/polaris-service/src/main/resources/META-INF/services/org.apache.polaris.service.auth.TokenBrokerFactory @@ -17,5 +17,5 @@ # under the License. # -io.polaris.service.auth.JWTRSAKeyPairFactory -io.polaris.service.auth.JWTSymmetricKeyFactory \ No newline at end of file +org.apache.polaris.service.auth.JWTRSAKeyPairFactory +org.apache.polaris.service.auth.JWTSymmetricKeyFactory \ No newline at end of file diff --git a/polaris-service/src/main/resources/META-INF/services/io.polaris.service.config.OAuth2ApiService b/polaris-service/src/main/resources/META-INF/services/org.apache.polaris.service.config.OAuth2ApiService similarity index 87% rename from polaris-service/src/main/resources/META-INF/services/io.polaris.service.config.OAuth2ApiService rename to polaris-service/src/main/resources/META-INF/services/org.apache.polaris.service.config.OAuth2ApiService index 0f70464542..3c8f0e2542 100644 --- a/polaris-service/src/main/resources/META-INF/services/io.polaris.service.config.OAuth2ApiService +++ b/polaris-service/src/main/resources/META-INF/services/org.apache.polaris.service.config.OAuth2ApiService @@ -17,5 +17,5 @@ # under the License. # -io.polaris.service.auth.TestOAuth2ApiService -io.polaris.service.auth.DefaultOAuth2ApiService \ No newline at end of file +org.apache.polaris.service.auth.TestOAuth2ApiService +org.apache.polaris.service.auth.DefaultOAuth2ApiService \ No newline at end of file diff --git a/polaris-service/src/main/resources/META-INF/services/io.polaris.service.context.CallContextResolver b/polaris-service/src/main/resources/META-INF/services/org.apache.polaris.service.context.CallContextResolver similarity index 93% rename from polaris-service/src/main/resources/META-INF/services/io.polaris.service.context.CallContextResolver rename to polaris-service/src/main/resources/META-INF/services/org.apache.polaris.service.context.CallContextResolver index 2f173458c1..1ac9dbea22 100644 --- a/polaris-service/src/main/resources/META-INF/services/io.polaris.service.context.CallContextResolver +++ b/polaris-service/src/main/resources/META-INF/services/org.apache.polaris.service.context.CallContextResolver @@ -17,4 +17,4 @@ # under the License. # -io.polaris.service.context.DefaultContextResolver \ No newline at end of file +org.apache.polaris.service.context.DefaultContextResolver \ No newline at end of file diff --git a/polaris-service/src/main/resources/META-INF/services/io.polaris.service.context.RealmContextResolver b/polaris-service/src/main/resources/META-INF/services/org.apache.polaris.service.context.RealmContextResolver similarity index 93% rename from polaris-service/src/main/resources/META-INF/services/io.polaris.service.context.RealmContextResolver rename to polaris-service/src/main/resources/META-INF/services/org.apache.polaris.service.context.RealmContextResolver index 2f173458c1..1ac9dbea22 100644 --- a/polaris-service/src/main/resources/META-INF/services/io.polaris.service.context.RealmContextResolver +++ b/polaris-service/src/main/resources/META-INF/services/org.apache.polaris.service.context.RealmContextResolver @@ -17,4 +17,4 @@ # under the License. # -io.polaris.service.context.DefaultContextResolver \ No newline at end of file +org.apache.polaris.service.context.DefaultContextResolver \ No newline at end of file diff --git a/polaris-service/src/main/resources/io/polaris/service/banner.txt b/polaris-service/src/main/resources/org/apache/polaris/service/banner.txt similarity index 100% rename from polaris-service/src/main/resources/io/polaris/service/banner.txt rename to polaris-service/src/main/resources/org/apache/polaris/service/banner.txt diff --git a/polaris-service/src/test/java/io/polaris/service/PolarisApplicationIntegrationTest.java b/polaris-service/src/test/java/org/apache/polaris/service/PolarisApplicationIntegrationTest.java similarity index 96% rename from polaris-service/src/test/java/io/polaris/service/PolarisApplicationIntegrationTest.java rename to polaris-service/src/test/java/org/apache/polaris/service/PolarisApplicationIntegrationTest.java index 6603c186bf..5c37ddf0fd 100644 --- a/polaris-service/src/test/java/io/polaris/service/PolarisApplicationIntegrationTest.java +++ b/polaris-service/src/test/java/org/apache/polaris/service/PolarisApplicationIntegrationTest.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service; +package org.apache.polaris.service; -import static io.polaris.service.context.DefaultContextResolver.REALM_PROPERTY_KEY; +import static org.apache.polaris.service.context.DefaultContextResolver.REALM_PROPERTY_KEY; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -26,21 +26,6 @@ import io.dropwizard.testing.ResourceHelpers; import io.dropwizard.testing.junit5.DropwizardAppExtension; import io.dropwizard.testing.junit5.DropwizardExtensionsSupport; -import io.polaris.core.admin.model.AwsStorageConfigInfo; -import io.polaris.core.admin.model.Catalog; -import io.polaris.core.admin.model.CatalogProperties; -import io.polaris.core.admin.model.CatalogRole; -import io.polaris.core.admin.model.ExternalCatalog; -import io.polaris.core.admin.model.FileStorageConfigInfo; -import io.polaris.core.admin.model.PolarisCatalog; -import io.polaris.core.admin.model.PrincipalRole; -import io.polaris.core.admin.model.StorageConfigInfo; -import io.polaris.core.entity.CatalogEntity; -import io.polaris.core.entity.PolarisEntityConstants; -import io.polaris.service.auth.BasePolarisAuthenticator; -import io.polaris.service.config.PolarisApplicationConfig; -import io.polaris.service.test.PolarisConnectionExtension; -import io.polaris.service.test.SnowmanCredentialsExtension; import jakarta.ws.rs.client.Entity; import jakarta.ws.rs.core.Response; import java.io.IOException; @@ -73,6 +58,21 @@ import org.apache.iceberg.rest.auth.OAuth2Properties; import org.apache.iceberg.types.Types; import org.apache.iceberg.util.EnvironmentUtil; +import org.apache.polaris.core.admin.model.AwsStorageConfigInfo; +import org.apache.polaris.core.admin.model.Catalog; +import org.apache.polaris.core.admin.model.CatalogProperties; +import org.apache.polaris.core.admin.model.CatalogRole; +import org.apache.polaris.core.admin.model.ExternalCatalog; +import org.apache.polaris.core.admin.model.FileStorageConfigInfo; +import org.apache.polaris.core.admin.model.PolarisCatalog; +import org.apache.polaris.core.admin.model.PrincipalRole; +import org.apache.polaris.core.admin.model.StorageConfigInfo; +import org.apache.polaris.core.entity.CatalogEntity; +import org.apache.polaris.core.entity.PolarisEntityConstants; +import org.apache.polaris.service.auth.BasePolarisAuthenticator; +import org.apache.polaris.service.config.PolarisApplicationConfig; +import org.apache.polaris.service.test.PolarisConnectionExtension; +import org.apache.polaris.service.test.SnowmanCredentialsExtension; import org.assertj.core.api.Assertions; import org.assertj.core.api.InstanceOfAssertFactories; import org.junit.jupiter.api.AfterAll; diff --git a/polaris-service/src/test/java/io/polaris/service/admin/PolarisAdminServiceAuthzTest.java b/polaris-service/src/test/java/org/apache/polaris/service/admin/PolarisAdminServiceAuthzTest.java similarity index 98% rename from polaris-service/src/test/java/io/polaris/service/admin/PolarisAdminServiceAuthzTest.java rename to polaris-service/src/test/java/org/apache/polaris/service/admin/PolarisAdminServiceAuthzTest.java index 2394b2c93d..d174cc04f3 100644 --- a/polaris-service/src/test/java/io/polaris/service/admin/PolarisAdminServiceAuthzTest.java +++ b/polaris-service/src/test/java/org/apache/polaris/service/admin/PolarisAdminServiceAuthzTest.java @@ -16,22 +16,22 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.admin; +package org.apache.polaris.service.admin; -import io.polaris.core.admin.model.UpdateCatalogRequest; -import io.polaris.core.admin.model.UpdateCatalogRoleRequest; -import io.polaris.core.admin.model.UpdatePrincipalRequest; -import io.polaris.core.admin.model.UpdatePrincipalRoleRequest; -import io.polaris.core.auth.AuthenticatedPolarisPrincipal; -import io.polaris.core.entity.CatalogEntity; -import io.polaris.core.entity.CatalogRoleEntity; -import io.polaris.core.entity.PolarisPrivilege; -import io.polaris.core.entity.PrincipalEntity; -import io.polaris.core.entity.PrincipalRoleEntity; import java.util.List; import java.util.Map; import java.util.Set; import java.util.function.Function; +import org.apache.polaris.core.admin.model.UpdateCatalogRequest; +import org.apache.polaris.core.admin.model.UpdateCatalogRoleRequest; +import org.apache.polaris.core.admin.model.UpdatePrincipalRequest; +import org.apache.polaris.core.admin.model.UpdatePrincipalRoleRequest; +import org.apache.polaris.core.auth.AuthenticatedPolarisPrincipal; +import org.apache.polaris.core.entity.CatalogEntity; +import org.apache.polaris.core.entity.CatalogRoleEntity; +import org.apache.polaris.core.entity.PolarisPrivilege; +import org.apache.polaris.core.entity.PrincipalEntity; +import org.apache.polaris.core.entity.PrincipalRoleEntity; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/polaris-service/src/test/java/io/polaris/service/admin/PolarisAuthzTestBase.java b/polaris-service/src/test/java/org/apache/polaris/service/admin/PolarisAuthzTestBase.java similarity index 90% rename from polaris-service/src/test/java/io/polaris/service/admin/PolarisAuthzTestBase.java rename to polaris-service/src/test/java/org/apache/polaris/service/admin/PolarisAuthzTestBase.java index 56d8fcc592..147d2b28b5 100644 --- a/polaris-service/src/test/java/io/polaris/service/admin/PolarisAuthzTestBase.java +++ b/polaris-service/src/test/java/org/apache/polaris/service/admin/PolarisAuthzTestBase.java @@ -16,45 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.admin; +package org.apache.polaris.service.admin; import static org.apache.iceberg.types.Types.NestedField.required; import com.google.common.collect.ImmutableMap; -import io.polaris.core.PolarisCallContext; -import io.polaris.core.PolarisConfiguration; -import io.polaris.core.PolarisConfigurationStore; -import io.polaris.core.PolarisDefaultDiagServiceImpl; -import io.polaris.core.PolarisDiagnostics; -import io.polaris.core.admin.model.FileStorageConfigInfo; -import io.polaris.core.admin.model.PrincipalWithCredentials; -import io.polaris.core.admin.model.PrincipalWithCredentialsCredentials; -import io.polaris.core.admin.model.StorageConfigInfo; -import io.polaris.core.auth.AuthenticatedPolarisPrincipal; -import io.polaris.core.auth.PolarisAuthorizer; -import io.polaris.core.context.CallContext; -import io.polaris.core.context.RealmContext; -import io.polaris.core.entity.CatalogEntity; -import io.polaris.core.entity.CatalogRoleEntity; -import io.polaris.core.entity.PolarisBaseEntity; -import io.polaris.core.entity.PolarisEntity; -import io.polaris.core.entity.PolarisEntitySubType; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.entity.PolarisPrivilege; -import io.polaris.core.entity.PrincipalEntity; -import io.polaris.core.entity.PrincipalRoleEntity; -import io.polaris.core.persistence.PolarisEntityManager; -import io.polaris.core.persistence.PolarisMetaStoreManager; -import io.polaris.core.persistence.PolarisTreeMapStore; -import io.polaris.core.persistence.resolver.PolarisResolutionManifest; -import io.polaris.core.storage.cache.StorageCredentialCache; -import io.polaris.service.catalog.BasePolarisCatalog; -import io.polaris.service.catalog.PolarisPassthroughResolutionView; -import io.polaris.service.config.DefaultConfigurationStore; -import io.polaris.service.config.RealmEntityManagerFactory; -import io.polaris.service.context.PolarisCallContextCatalogFactory; -import io.polaris.service.persistence.InMemoryPolarisMetaStoreManagerFactory; -import io.polaris.service.storage.PolarisStorageIntegrationProviderImpl; import java.io.IOException; import java.time.Clock; import java.util.List; @@ -68,6 +34,40 @@ import org.apache.iceberg.catalog.TableIdentifier; import org.apache.iceberg.exceptions.ForbiddenException; import org.apache.iceberg.types.Types; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.PolarisConfiguration; +import org.apache.polaris.core.PolarisConfigurationStore; +import org.apache.polaris.core.PolarisDefaultDiagServiceImpl; +import org.apache.polaris.core.PolarisDiagnostics; +import org.apache.polaris.core.admin.model.FileStorageConfigInfo; +import org.apache.polaris.core.admin.model.PrincipalWithCredentials; +import org.apache.polaris.core.admin.model.PrincipalWithCredentialsCredentials; +import org.apache.polaris.core.admin.model.StorageConfigInfo; +import org.apache.polaris.core.auth.AuthenticatedPolarisPrincipal; +import org.apache.polaris.core.auth.PolarisAuthorizer; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.context.RealmContext; +import org.apache.polaris.core.entity.CatalogEntity; +import org.apache.polaris.core.entity.CatalogRoleEntity; +import org.apache.polaris.core.entity.PolarisBaseEntity; +import org.apache.polaris.core.entity.PolarisEntity; +import org.apache.polaris.core.entity.PolarisEntitySubType; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.entity.PolarisPrivilege; +import org.apache.polaris.core.entity.PrincipalEntity; +import org.apache.polaris.core.entity.PrincipalRoleEntity; +import org.apache.polaris.core.persistence.PolarisEntityManager; +import org.apache.polaris.core.persistence.PolarisMetaStoreManager; +import org.apache.polaris.core.persistence.PolarisTreeMapStore; +import org.apache.polaris.core.persistence.resolver.PolarisResolutionManifest; +import org.apache.polaris.core.storage.cache.StorageCredentialCache; +import org.apache.polaris.service.catalog.BasePolarisCatalog; +import org.apache.polaris.service.catalog.PolarisPassthroughResolutionView; +import org.apache.polaris.service.config.DefaultConfigurationStore; +import org.apache.polaris.service.config.RealmEntityManagerFactory; +import org.apache.polaris.service.context.PolarisCallContextCatalogFactory; +import org.apache.polaris.service.persistence.InMemoryPolarisMetaStoreManagerFactory; +import org.apache.polaris.service.storage.PolarisStorageIntegrationProviderImpl; import org.assertj.core.api.Assertions; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/polaris-service/src/test/java/io/polaris/service/admin/PolarisOverlappingCatalogTest.java b/polaris-service/src/test/java/org/apache/polaris/service/admin/PolarisOverlappingCatalogTest.java similarity index 93% rename from polaris-service/src/test/java/io/polaris/service/admin/PolarisOverlappingCatalogTest.java rename to polaris-service/src/test/java/org/apache/polaris/service/admin/PolarisOverlappingCatalogTest.java index 43cbf5cf0c..180dc82352 100644 --- a/polaris-service/src/test/java/io/polaris/service/admin/PolarisOverlappingCatalogTest.java +++ b/polaris-service/src/test/java/org/apache/polaris/service/admin/PolarisOverlappingCatalogTest.java @@ -16,23 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.admin; +package org.apache.polaris.service.admin; -import static io.polaris.service.context.DefaultContextResolver.REALM_PROPERTY_KEY; +import static org.apache.polaris.service.context.DefaultContextResolver.REALM_PROPERTY_KEY; import static org.assertj.core.api.Assertions.assertThat; import io.dropwizard.testing.ConfigOverride; import io.dropwizard.testing.ResourceHelpers; import io.dropwizard.testing.junit5.DropwizardAppExtension; import io.dropwizard.testing.junit5.DropwizardExtensionsSupport; -import io.polaris.core.admin.model.AwsStorageConfigInfo; -import io.polaris.core.admin.model.Catalog; -import io.polaris.core.admin.model.CatalogProperties; -import io.polaris.core.admin.model.CreateCatalogRequest; -import io.polaris.core.admin.model.StorageConfigInfo; -import io.polaris.service.PolarisApplication; -import io.polaris.service.config.PolarisApplicationConfig; -import io.polaris.service.test.PolarisConnectionExtension; import jakarta.ws.rs.client.Entity; import jakarta.ws.rs.client.Invocation; import jakarta.ws.rs.core.Response; @@ -40,6 +32,14 @@ import java.util.Arrays; import java.util.List; import java.util.UUID; +import org.apache.polaris.core.admin.model.AwsStorageConfigInfo; +import org.apache.polaris.core.admin.model.Catalog; +import org.apache.polaris.core.admin.model.CatalogProperties; +import org.apache.polaris.core.admin.model.CreateCatalogRequest; +import org.apache.polaris.core.admin.model.StorageConfigInfo; +import org.apache.polaris.service.PolarisApplication; +import org.apache.polaris.service.config.PolarisApplicationConfig; +import org.apache.polaris.service.test.PolarisConnectionExtension; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/polaris-service/src/test/java/io/polaris/service/admin/PolarisServiceImplIntegrationTest.java b/polaris-service/src/test/java/org/apache/polaris/service/admin/PolarisServiceImplIntegrationTest.java similarity index 97% rename from polaris-service/src/test/java/io/polaris/service/admin/PolarisServiceImplIntegrationTest.java rename to polaris-service/src/test/java/org/apache/polaris/service/admin/PolarisServiceImplIntegrationTest.java index 527de76584..253aa68583 100644 --- a/polaris-service/src/test/java/io/polaris/service/admin/PolarisServiceImplIntegrationTest.java +++ b/polaris-service/src/test/java/org/apache/polaris/service/admin/PolarisServiceImplIntegrationTest.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.admin; +package org.apache.polaris.service.admin; import static io.dropwizard.jackson.Jackson.newObjectMapper; -import static io.polaris.service.context.DefaultContextResolver.REALM_PROPERTY_KEY; +import static org.apache.polaris.service.context.DefaultContextResolver.REALM_PROPERTY_KEY; import static org.assertj.core.api.Assertions.assertThat; import com.fasterxml.jackson.core.JsonProcessingException; @@ -30,37 +30,6 @@ import io.dropwizard.testing.ResourceHelpers; import io.dropwizard.testing.junit5.DropwizardAppExtension; import io.dropwizard.testing.junit5.DropwizardExtensionsSupport; -import io.polaris.core.admin.model.AwsStorageConfigInfo; -import io.polaris.core.admin.model.AzureStorageConfigInfo; -import io.polaris.core.admin.model.Catalog; -import io.polaris.core.admin.model.CatalogProperties; -import io.polaris.core.admin.model.CatalogRole; -import io.polaris.core.admin.model.CatalogRoles; -import io.polaris.core.admin.model.Catalogs; -import io.polaris.core.admin.model.CreateCatalogRequest; -import io.polaris.core.admin.model.CreateCatalogRoleRequest; -import io.polaris.core.admin.model.CreatePrincipalRequest; -import io.polaris.core.admin.model.CreatePrincipalRoleRequest; -import io.polaris.core.admin.model.ExternalCatalog; -import io.polaris.core.admin.model.FileStorageConfigInfo; -import io.polaris.core.admin.model.GrantCatalogRoleRequest; -import io.polaris.core.admin.model.PolarisCatalog; -import io.polaris.core.admin.model.Principal; -import io.polaris.core.admin.model.PrincipalRole; -import io.polaris.core.admin.model.PrincipalRoles; -import io.polaris.core.admin.model.PrincipalWithCredentials; -import io.polaris.core.admin.model.PrincipalWithCredentialsCredentials; -import io.polaris.core.admin.model.Principals; -import io.polaris.core.admin.model.StorageConfigInfo; -import io.polaris.core.admin.model.UpdateCatalogRequest; -import io.polaris.core.admin.model.UpdateCatalogRoleRequest; -import io.polaris.core.admin.model.UpdatePrincipalRequest; -import io.polaris.core.admin.model.UpdatePrincipalRoleRequest; -import io.polaris.core.entity.PolarisEntityConstants; -import io.polaris.service.PolarisApplication; -import io.polaris.service.auth.TokenUtils; -import io.polaris.service.config.PolarisApplicationConfig; -import io.polaris.service.test.PolarisConnectionExtension; import jakarta.ws.rs.client.Entity; import jakarta.ws.rs.client.Invocation; import jakarta.ws.rs.core.Response; @@ -70,6 +39,37 @@ import java.util.Map; import org.apache.commons.lang3.RandomStringUtils; import org.apache.iceberg.rest.responses.ErrorResponse; +import org.apache.polaris.core.admin.model.AwsStorageConfigInfo; +import org.apache.polaris.core.admin.model.AzureStorageConfigInfo; +import org.apache.polaris.core.admin.model.Catalog; +import org.apache.polaris.core.admin.model.CatalogProperties; +import org.apache.polaris.core.admin.model.CatalogRole; +import org.apache.polaris.core.admin.model.CatalogRoles; +import org.apache.polaris.core.admin.model.Catalogs; +import org.apache.polaris.core.admin.model.CreateCatalogRequest; +import org.apache.polaris.core.admin.model.CreateCatalogRoleRequest; +import org.apache.polaris.core.admin.model.CreatePrincipalRequest; +import org.apache.polaris.core.admin.model.CreatePrincipalRoleRequest; +import org.apache.polaris.core.admin.model.ExternalCatalog; +import org.apache.polaris.core.admin.model.FileStorageConfigInfo; +import org.apache.polaris.core.admin.model.GrantCatalogRoleRequest; +import org.apache.polaris.core.admin.model.PolarisCatalog; +import org.apache.polaris.core.admin.model.Principal; +import org.apache.polaris.core.admin.model.PrincipalRole; +import org.apache.polaris.core.admin.model.PrincipalRoles; +import org.apache.polaris.core.admin.model.PrincipalWithCredentials; +import org.apache.polaris.core.admin.model.PrincipalWithCredentialsCredentials; +import org.apache.polaris.core.admin.model.Principals; +import org.apache.polaris.core.admin.model.StorageConfigInfo; +import org.apache.polaris.core.admin.model.UpdateCatalogRequest; +import org.apache.polaris.core.admin.model.UpdateCatalogRoleRequest; +import org.apache.polaris.core.admin.model.UpdatePrincipalRequest; +import org.apache.polaris.core.admin.model.UpdatePrincipalRoleRequest; +import org.apache.polaris.core.entity.PolarisEntityConstants; +import org.apache.polaris.service.PolarisApplication; +import org.apache.polaris.service.auth.TokenUtils; +import org.apache.polaris.service.config.PolarisApplicationConfig; +import org.apache.polaris.service.test.PolarisConnectionExtension; import org.assertj.core.api.InstanceOfAssertFactories; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; diff --git a/polaris-service/src/test/java/io/polaris/service/auth/JWTRSAKeyPairTest.java b/polaris-service/src/test/java/org/apache/polaris/service/auth/JWTRSAKeyPairTest.java similarity index 89% rename from polaris-service/src/test/java/io/polaris/service/auth/JWTRSAKeyPairTest.java rename to polaris-service/src/test/java/org/apache/polaris/service/auth/JWTRSAKeyPairTest.java index 7d4a0b583f..b4e351586b 100644 --- a/polaris-service/src/test/java/io/polaris/service/auth/JWTRSAKeyPairTest.java +++ b/polaris-service/src/test/java/org/apache/polaris/service/auth/JWTRSAKeyPairTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.auth; +package org.apache.polaris.service.auth; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThat; @@ -25,17 +25,6 @@ import com.auth0.jwt.JWTVerifier; import com.auth0.jwt.algorithms.Algorithm; import com.auth0.jwt.interfaces.DecodedJWT; -import io.polaris.core.PolarisCallContext; -import io.polaris.core.context.CallContext; -import io.polaris.core.context.RealmContext; -import io.polaris.core.entity.PolarisBaseEntity; -import io.polaris.core.entity.PolarisEntitySubType; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.entity.PolarisPrincipalSecrets; -import io.polaris.core.persistence.PolarisEntityManager; -import io.polaris.core.persistence.PolarisMetaStoreManager; -import io.polaris.core.storage.cache.StorageCredentialCache; -import io.polaris.service.config.DefaultConfigurationStore; import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; @@ -46,6 +35,17 @@ import java.util.Base64; import java.util.HashMap; import java.util.Map; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.context.RealmContext; +import org.apache.polaris.core.entity.PolarisBaseEntity; +import org.apache.polaris.core.entity.PolarisEntitySubType; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.entity.PolarisPrincipalSecrets; +import org.apache.polaris.core.persistence.PolarisEntityManager; +import org.apache.polaris.core.persistence.PolarisMetaStoreManager; +import org.apache.polaris.core.storage.cache.StorageCredentialCache; +import org.apache.polaris.service.config.DefaultConfigurationStore; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/polaris-service/src/test/java/io/polaris/service/auth/JWTSymmetricKeyGeneratorTest.java b/polaris-service/src/test/java/org/apache/polaris/service/auth/JWTSymmetricKeyGeneratorTest.java similarity index 84% rename from polaris-service/src/test/java/io/polaris/service/auth/JWTSymmetricKeyGeneratorTest.java rename to polaris-service/src/test/java/org/apache/polaris/service/auth/JWTSymmetricKeyGeneratorTest.java index 0dcf97c1f2..f778b47c2a 100644 --- a/polaris-service/src/test/java/io/polaris/service/auth/JWTSymmetricKeyGeneratorTest.java +++ b/polaris-service/src/test/java/org/apache/polaris/service/auth/JWTSymmetricKeyGeneratorTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.auth; +package org.apache.polaris.service.auth; import static org.assertj.core.api.Assertions.assertThat; @@ -24,17 +24,17 @@ import com.auth0.jwt.JWTVerifier; import com.auth0.jwt.algorithms.Algorithm; import com.auth0.jwt.interfaces.DecodedJWT; -import io.polaris.core.PolarisCallContext; -import io.polaris.core.context.CallContext; -import io.polaris.core.context.RealmContext; -import io.polaris.core.entity.PolarisBaseEntity; -import io.polaris.core.entity.PolarisEntitySubType; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.entity.PolarisPrincipalSecrets; -import io.polaris.core.persistence.PolarisEntityManager; -import io.polaris.core.persistence.PolarisMetaStoreManager; -import io.polaris.core.storage.cache.StorageCredentialCache; import java.util.Map; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.context.RealmContext; +import org.apache.polaris.core.entity.PolarisBaseEntity; +import org.apache.polaris.core.entity.PolarisEntitySubType; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.entity.PolarisPrincipalSecrets; +import org.apache.polaris.core.persistence.PolarisEntityManager; +import org.apache.polaris.core.persistence.PolarisMetaStoreManager; +import org.apache.polaris.core.storage.cache.StorageCredentialCache; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/polaris-service/src/test/java/io/polaris/service/auth/TokenRequestValidatorTest.java b/polaris-service/src/test/java/org/apache/polaris/service/auth/TokenRequestValidatorTest.java similarity index 98% rename from polaris-service/src/test/java/io/polaris/service/auth/TokenRequestValidatorTest.java rename to polaris-service/src/test/java/org/apache/polaris/service/auth/TokenRequestValidatorTest.java index 66179a3539..bd8dd9a3a6 100644 --- a/polaris-service/src/test/java/io/polaris/service/auth/TokenRequestValidatorTest.java +++ b/polaris-service/src/test/java/org/apache/polaris/service/auth/TokenRequestValidatorTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.auth; +package org.apache.polaris.service.auth; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/polaris-service/src/test/java/io/polaris/service/auth/TokenUtils.java b/polaris-service/src/test/java/org/apache/polaris/service/auth/TokenUtils.java similarity index 94% rename from polaris-service/src/test/java/io/polaris/service/auth/TokenUtils.java rename to polaris-service/src/test/java/org/apache/polaris/service/auth/TokenUtils.java index 34e39d815a..c04e427047 100644 --- a/polaris-service/src/test/java/io/polaris/service/auth/TokenUtils.java +++ b/polaris-service/src/test/java/org/apache/polaris/service/auth/TokenUtils.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.auth; +package org.apache.polaris.service.auth; -import static io.polaris.service.context.DefaultContextResolver.REALM_PROPERTY_KEY; +import static org.apache.polaris.service.context.DefaultContextResolver.REALM_PROPERTY_KEY; import static org.assertj.core.api.Assertions.assertThat; import jakarta.ws.rs.client.Client; diff --git a/polaris-service/src/test/java/io/polaris/service/catalog/BasePolarisCatalogTest.java b/polaris-service/src/test/java/org/apache/polaris/service/catalog/BasePolarisCatalogTest.java similarity index 95% rename from polaris-service/src/test/java/io/polaris/service/catalog/BasePolarisCatalogTest.java rename to polaris-service/src/test/java/org/apache/polaris/service/catalog/BasePolarisCatalogTest.java index 56a15928f1..6a89f29762 100644 --- a/polaris-service/src/test/java/io/polaris/service/catalog/BasePolarisCatalogTest.java +++ b/polaris-service/src/test/java/org/apache/polaris/service/catalog/BasePolarisCatalogTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.catalog; +package org.apache.polaris.service.catalog; import static java.nio.charset.StandardCharsets.UTF_8; import static org.apache.iceberg.types.Types.NestedField.required; @@ -24,42 +24,6 @@ import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableMap; -import io.polaris.core.PolarisCallContext; -import io.polaris.core.PolarisConfiguration; -import io.polaris.core.PolarisConfigurationStore; -import io.polaris.core.PolarisDefaultDiagServiceImpl; -import io.polaris.core.PolarisDiagnostics; -import io.polaris.core.admin.model.AwsStorageConfigInfo; -import io.polaris.core.admin.model.StorageConfigInfo; -import io.polaris.core.auth.AuthenticatedPolarisPrincipal; -import io.polaris.core.auth.PolarisAuthorizer; -import io.polaris.core.context.CallContext; -import io.polaris.core.context.RealmContext; -import io.polaris.core.entity.CatalogEntity; -import io.polaris.core.entity.PolarisBaseEntity; -import io.polaris.core.entity.PolarisEntity; -import io.polaris.core.entity.PolarisEntitySubType; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.entity.PrincipalEntity; -import io.polaris.core.entity.TaskEntity; -import io.polaris.core.monitor.PolarisMetricRegistry; -import io.polaris.core.persistence.MetaStoreManagerFactory; -import io.polaris.core.persistence.PolarisEntityManager; -import io.polaris.core.persistence.PolarisMetaStoreManager; -import io.polaris.core.persistence.PolarisMetaStoreSession; -import io.polaris.core.storage.PolarisCredentialProperty; -import io.polaris.core.storage.PolarisStorageIntegration; -import io.polaris.core.storage.PolarisStorageIntegrationProvider; -import io.polaris.core.storage.aws.AwsCredentialsStorageIntegration; -import io.polaris.core.storage.aws.AwsStorageConfigurationInfo; -import io.polaris.core.storage.cache.StorageCredentialCache; -import io.polaris.service.admin.PolarisAdminService; -import io.polaris.service.persistence.InMemoryPolarisMetaStoreManagerFactory; -import io.polaris.service.task.TaskExecutor; -import io.polaris.service.task.TaskFileIOSupplier; -import io.polaris.service.types.NotificationRequest; -import io.polaris.service.types.NotificationType; -import io.polaris.service.types.TableUpdateNotification; import java.io.IOException; import java.time.Clock; import java.util.Arrays; @@ -90,6 +54,42 @@ import org.apache.iceberg.inmemory.InMemoryFileIO; import org.apache.iceberg.io.FileIO; import org.apache.iceberg.types.Types; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.PolarisConfiguration; +import org.apache.polaris.core.PolarisConfigurationStore; +import org.apache.polaris.core.PolarisDefaultDiagServiceImpl; +import org.apache.polaris.core.PolarisDiagnostics; +import org.apache.polaris.core.admin.model.AwsStorageConfigInfo; +import org.apache.polaris.core.admin.model.StorageConfigInfo; +import org.apache.polaris.core.auth.AuthenticatedPolarisPrincipal; +import org.apache.polaris.core.auth.PolarisAuthorizer; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.context.RealmContext; +import org.apache.polaris.core.entity.CatalogEntity; +import org.apache.polaris.core.entity.PolarisBaseEntity; +import org.apache.polaris.core.entity.PolarisEntity; +import org.apache.polaris.core.entity.PolarisEntitySubType; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.entity.PrincipalEntity; +import org.apache.polaris.core.entity.TaskEntity; +import org.apache.polaris.core.monitor.PolarisMetricRegistry; +import org.apache.polaris.core.persistence.MetaStoreManagerFactory; +import org.apache.polaris.core.persistence.PolarisEntityManager; +import org.apache.polaris.core.persistence.PolarisMetaStoreManager; +import org.apache.polaris.core.persistence.PolarisMetaStoreSession; +import org.apache.polaris.core.storage.PolarisCredentialProperty; +import org.apache.polaris.core.storage.PolarisStorageIntegration; +import org.apache.polaris.core.storage.PolarisStorageIntegrationProvider; +import org.apache.polaris.core.storage.aws.AwsCredentialsStorageIntegration; +import org.apache.polaris.core.storage.aws.AwsStorageConfigurationInfo; +import org.apache.polaris.core.storage.cache.StorageCredentialCache; +import org.apache.polaris.service.admin.PolarisAdminService; +import org.apache.polaris.service.persistence.InMemoryPolarisMetaStoreManagerFactory; +import org.apache.polaris.service.task.TaskExecutor; +import org.apache.polaris.service.task.TaskFileIOSupplier; +import org.apache.polaris.service.types.NotificationRequest; +import org.apache.polaris.service.types.NotificationType; +import org.apache.polaris.service.types.TableUpdateNotification; import org.assertj.core.api.AbstractBooleanAssert; import org.assertj.core.api.Assertions; import org.jetbrains.annotations.Nullable; diff --git a/polaris-service/src/test/java/io/polaris/service/catalog/BasePolarisCatalogViewTest.java b/polaris-service/src/test/java/org/apache/polaris/service/catalog/BasePolarisCatalogViewTest.java similarity index 78% rename from polaris-service/src/test/java/io/polaris/service/catalog/BasePolarisCatalogViewTest.java rename to polaris-service/src/test/java/org/apache/polaris/service/catalog/BasePolarisCatalogViewTest.java index 9674203846..5b1916d1a6 100644 --- a/polaris-service/src/test/java/io/polaris/service/catalog/BasePolarisCatalogViewTest.java +++ b/polaris-service/src/test/java/org/apache/polaris/service/catalog/BasePolarisCatalogViewTest.java @@ -16,31 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.catalog; +package org.apache.polaris.service.catalog; import com.google.common.collect.ImmutableMap; -import io.polaris.core.PolarisCallContext; -import io.polaris.core.PolarisConfiguration; -import io.polaris.core.PolarisConfigurationStore; -import io.polaris.core.PolarisDefaultDiagServiceImpl; -import io.polaris.core.PolarisDiagnostics; -import io.polaris.core.admin.model.FileStorageConfigInfo; -import io.polaris.core.admin.model.StorageConfigInfo; -import io.polaris.core.auth.AuthenticatedPolarisPrincipal; -import io.polaris.core.auth.PolarisAuthorizer; -import io.polaris.core.context.CallContext; -import io.polaris.core.context.RealmContext; -import io.polaris.core.entity.CatalogEntity; -import io.polaris.core.entity.PolarisEntity; -import io.polaris.core.entity.PolarisEntitySubType; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.entity.PrincipalEntity; -import io.polaris.core.persistence.PolarisEntityManager; -import io.polaris.core.persistence.PolarisMetaStoreManager; -import io.polaris.core.storage.cache.StorageCredentialCache; -import io.polaris.service.admin.PolarisAdminService; -import io.polaris.service.persistence.InMemoryPolarisMetaStoreManagerFactory; -import io.polaris.service.storage.PolarisStorageIntegrationProviderImpl; import java.time.Clock; import java.util.HashMap; import java.util.List; @@ -49,6 +27,28 @@ import org.apache.iceberg.CatalogProperties; import org.apache.iceberg.catalog.Catalog; import org.apache.iceberg.view.ViewCatalogTests; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.PolarisConfiguration; +import org.apache.polaris.core.PolarisConfigurationStore; +import org.apache.polaris.core.PolarisDefaultDiagServiceImpl; +import org.apache.polaris.core.PolarisDiagnostics; +import org.apache.polaris.core.admin.model.FileStorageConfigInfo; +import org.apache.polaris.core.admin.model.StorageConfigInfo; +import org.apache.polaris.core.auth.AuthenticatedPolarisPrincipal; +import org.apache.polaris.core.auth.PolarisAuthorizer; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.context.RealmContext; +import org.apache.polaris.core.entity.CatalogEntity; +import org.apache.polaris.core.entity.PolarisEntity; +import org.apache.polaris.core.entity.PolarisEntitySubType; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.entity.PrincipalEntity; +import org.apache.polaris.core.persistence.PolarisEntityManager; +import org.apache.polaris.core.persistence.PolarisMetaStoreManager; +import org.apache.polaris.core.storage.cache.StorageCredentialCache; +import org.apache.polaris.service.admin.PolarisAdminService; +import org.apache.polaris.service.persistence.InMemoryPolarisMetaStoreManagerFactory; +import org.apache.polaris.service.storage.PolarisStorageIntegrationProviderImpl; import org.jetbrains.annotations.Nullable; import org.junit.jupiter.api.BeforeEach; import org.mockito.Mockito; diff --git a/polaris-service/src/test/java/io/polaris/service/catalog/PolarisCatalogHandlerWrapperAuthzTest.java b/polaris-service/src/test/java/org/apache/polaris/service/catalog/PolarisCatalogHandlerWrapperAuthzTest.java similarity index 98% rename from polaris-service/src/test/java/io/polaris/service/catalog/PolarisCatalogHandlerWrapperAuthzTest.java rename to polaris-service/src/test/java/org/apache/polaris/service/catalog/PolarisCatalogHandlerWrapperAuthzTest.java index e384b8e319..27e37d1e8f 100644 --- a/polaris-service/src/test/java/io/polaris/service/catalog/PolarisCatalogHandlerWrapperAuthzTest.java +++ b/polaris-service/src/test/java/org/apache/polaris/service/catalog/PolarisCatalogHandlerWrapperAuthzTest.java @@ -16,28 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.catalog; +package org.apache.polaris.service.catalog; import com.google.common.collect.ImmutableMap; -import io.polaris.core.admin.model.FileStorageConfigInfo; -import io.polaris.core.admin.model.PrincipalWithCredentialsCredentials; -import io.polaris.core.admin.model.StorageConfigInfo; -import io.polaris.core.auth.AuthenticatedPolarisPrincipal; -import io.polaris.core.context.CallContext; -import io.polaris.core.context.RealmContext; -import io.polaris.core.entity.CatalogEntity; -import io.polaris.core.entity.CatalogRoleEntity; -import io.polaris.core.entity.PolarisPrivilege; -import io.polaris.core.entity.PrincipalEntity; -import io.polaris.core.persistence.PolarisEntityManager; -import io.polaris.core.persistence.PolarisMetaStoreManager; -import io.polaris.core.persistence.resolver.PolarisResolutionManifest; -import io.polaris.service.admin.PolarisAuthzTestBase; -import io.polaris.service.config.RealmEntityManagerFactory; -import io.polaris.service.context.PolarisCallContextCatalogFactory; -import io.polaris.service.types.NotificationRequest; -import io.polaris.service.types.NotificationType; -import io.polaris.service.types.TableUpdateNotification; import java.time.Instant; import java.util.List; import java.util.Set; @@ -63,6 +44,25 @@ import org.apache.iceberg.rest.requests.UpdateTableRequest; import org.apache.iceberg.view.ImmutableSQLViewRepresentation; import org.apache.iceberg.view.ImmutableViewVersion; +import org.apache.polaris.core.admin.model.FileStorageConfigInfo; +import org.apache.polaris.core.admin.model.PrincipalWithCredentialsCredentials; +import org.apache.polaris.core.admin.model.StorageConfigInfo; +import org.apache.polaris.core.auth.AuthenticatedPolarisPrincipal; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.context.RealmContext; +import org.apache.polaris.core.entity.CatalogEntity; +import org.apache.polaris.core.entity.CatalogRoleEntity; +import org.apache.polaris.core.entity.PolarisPrivilege; +import org.apache.polaris.core.entity.PrincipalEntity; +import org.apache.polaris.core.persistence.PolarisEntityManager; +import org.apache.polaris.core.persistence.PolarisMetaStoreManager; +import org.apache.polaris.core.persistence.resolver.PolarisResolutionManifest; +import org.apache.polaris.service.admin.PolarisAuthzTestBase; +import org.apache.polaris.service.config.RealmEntityManagerFactory; +import org.apache.polaris.service.context.PolarisCallContextCatalogFactory; +import org.apache.polaris.service.types.NotificationRequest; +import org.apache.polaris.service.types.NotificationType; +import org.apache.polaris.service.types.TableUpdateNotification; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/polaris-service/src/test/java/io/polaris/service/catalog/PolarisPassthroughResolutionView.java b/polaris-service/src/test/java/org/apache/polaris/service/catalog/PolarisPassthroughResolutionView.java similarity index 88% rename from polaris-service/src/test/java/io/polaris/service/catalog/PolarisPassthroughResolutionView.java rename to polaris-service/src/test/java/org/apache/polaris/service/catalog/PolarisPassthroughResolutionView.java index 4317f77663..761d82cb58 100644 --- a/polaris-service/src/test/java/io/polaris/service/catalog/PolarisPassthroughResolutionView.java +++ b/polaris-service/src/test/java/org/apache/polaris/service/catalog/PolarisPassthroughResolutionView.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.catalog; +package org.apache.polaris.service.catalog; -import io.polaris.core.auth.AuthenticatedPolarisPrincipal; -import io.polaris.core.catalog.PolarisCatalogHelpers; -import io.polaris.core.context.CallContext; -import io.polaris.core.entity.PolarisEntitySubType; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.persistence.PolarisEntityManager; -import io.polaris.core.persistence.PolarisResolvedPathWrapper; -import io.polaris.core.persistence.resolver.PolarisResolutionManifest; -import io.polaris.core.persistence.resolver.PolarisResolutionManifestCatalogView; -import io.polaris.core.persistence.resolver.ResolverPath; import java.util.Arrays; import org.apache.iceberg.catalog.Namespace; import org.apache.iceberg.catalog.TableIdentifier; +import org.apache.polaris.core.auth.AuthenticatedPolarisPrincipal; +import org.apache.polaris.core.catalog.PolarisCatalogHelpers; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.entity.PolarisEntitySubType; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.persistence.PolarisEntityManager; +import org.apache.polaris.core.persistence.PolarisResolvedPathWrapper; +import org.apache.polaris.core.persistence.resolver.PolarisResolutionManifest; +import org.apache.polaris.core.persistence.resolver.PolarisResolutionManifestCatalogView; +import org.apache.polaris.core.persistence.resolver.ResolverPath; /** * For test purposes or for elevated-privilege scenarios where entity resolution is allowed to diff --git a/polaris-service/src/test/java/io/polaris/service/catalog/PolarisRestCatalogIntegrationTest.java b/polaris-service/src/test/java/org/apache/polaris/service/catalog/PolarisRestCatalogIntegrationTest.java similarity index 93% rename from polaris-service/src/test/java/io/polaris/service/catalog/PolarisRestCatalogIntegrationTest.java rename to polaris-service/src/test/java/org/apache/polaris/service/catalog/PolarisRestCatalogIntegrationTest.java index 39f78fe1ee..0f2a8ac568 100644 --- a/polaris-service/src/test/java/io/polaris/service/catalog/PolarisRestCatalogIntegrationTest.java +++ b/polaris-service/src/test/java/org/apache/polaris/service/catalog/PolarisRestCatalogIntegrationTest.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.catalog; +package org.apache.polaris.service.catalog; -import static io.polaris.service.context.DefaultContextResolver.REALM_PROPERTY_KEY; import static org.apache.iceberg.types.Types.NestedField.required; +import static org.apache.polaris.service.context.DefaultContextResolver.REALM_PROPERTY_KEY; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -28,37 +28,6 @@ import io.dropwizard.testing.ResourceHelpers; import io.dropwizard.testing.junit5.DropwizardAppExtension; import io.dropwizard.testing.junit5.DropwizardExtensionsSupport; -import io.polaris.core.PolarisConfiguration; -import io.polaris.core.admin.model.AwsStorageConfigInfo; -import io.polaris.core.admin.model.Catalog; -import io.polaris.core.admin.model.CatalogGrant; -import io.polaris.core.admin.model.CatalogPrivilege; -import io.polaris.core.admin.model.CatalogRole; -import io.polaris.core.admin.model.FileStorageConfigInfo; -import io.polaris.core.admin.model.GrantResource; -import io.polaris.core.admin.model.GrantResources; -import io.polaris.core.admin.model.NamespaceGrant; -import io.polaris.core.admin.model.NamespacePrivilege; -import io.polaris.core.admin.model.PolarisCatalog; -import io.polaris.core.admin.model.StorageConfigInfo; -import io.polaris.core.admin.model.TableGrant; -import io.polaris.core.admin.model.TablePrivilege; -import io.polaris.core.admin.model.UpdateCatalogRequest; -import io.polaris.core.admin.model.ViewGrant; -import io.polaris.core.admin.model.ViewPrivilege; -import io.polaris.core.entity.CatalogEntity; -import io.polaris.core.entity.PolarisEntityConstants; -import io.polaris.service.PolarisApplication; -import io.polaris.service.auth.BasePolarisAuthenticator; -import io.polaris.service.auth.TokenUtils; -import io.polaris.service.config.PolarisApplicationConfig; -import io.polaris.service.test.PolarisConnectionExtension; -import io.polaris.service.test.PolarisConnectionExtension.PolarisToken; -import io.polaris.service.test.SnowmanCredentialsExtension; -import io.polaris.service.test.SnowmanCredentialsExtension.SnowmanCredentials; -import io.polaris.service.types.NotificationRequest; -import io.polaris.service.types.NotificationType; -import io.polaris.service.types.TableUpdateNotification; import jakarta.ws.rs.client.Entity; import jakarta.ws.rs.core.Response; import java.io.IOException; @@ -85,6 +54,37 @@ import org.apache.iceberg.rest.auth.OAuth2Properties; import org.apache.iceberg.rest.responses.ErrorResponse; import org.apache.iceberg.types.Types; +import org.apache.polaris.core.PolarisConfiguration; +import org.apache.polaris.core.admin.model.AwsStorageConfigInfo; +import org.apache.polaris.core.admin.model.Catalog; +import org.apache.polaris.core.admin.model.CatalogGrant; +import org.apache.polaris.core.admin.model.CatalogPrivilege; +import org.apache.polaris.core.admin.model.CatalogRole; +import org.apache.polaris.core.admin.model.FileStorageConfigInfo; +import org.apache.polaris.core.admin.model.GrantResource; +import org.apache.polaris.core.admin.model.GrantResources; +import org.apache.polaris.core.admin.model.NamespaceGrant; +import org.apache.polaris.core.admin.model.NamespacePrivilege; +import org.apache.polaris.core.admin.model.PolarisCatalog; +import org.apache.polaris.core.admin.model.StorageConfigInfo; +import org.apache.polaris.core.admin.model.TableGrant; +import org.apache.polaris.core.admin.model.TablePrivilege; +import org.apache.polaris.core.admin.model.UpdateCatalogRequest; +import org.apache.polaris.core.admin.model.ViewGrant; +import org.apache.polaris.core.admin.model.ViewPrivilege; +import org.apache.polaris.core.entity.CatalogEntity; +import org.apache.polaris.core.entity.PolarisEntityConstants; +import org.apache.polaris.service.PolarisApplication; +import org.apache.polaris.service.auth.BasePolarisAuthenticator; +import org.apache.polaris.service.auth.TokenUtils; +import org.apache.polaris.service.config.PolarisApplicationConfig; +import org.apache.polaris.service.test.PolarisConnectionExtension; +import org.apache.polaris.service.test.PolarisConnectionExtension.PolarisToken; +import org.apache.polaris.service.test.SnowmanCredentialsExtension; +import org.apache.polaris.service.test.SnowmanCredentialsExtension.SnowmanCredentials; +import org.apache.polaris.service.types.NotificationRequest; +import org.apache.polaris.service.types.NotificationType; +import org.apache.polaris.service.types.TableUpdateNotification; import org.assertj.core.api.Assertions; import org.assertj.core.api.InstanceOfAssertFactories; import org.junit.jupiter.api.BeforeAll; @@ -178,8 +178,8 @@ public void before( .setStorageType(StorageConfigInfo.StorageTypeEnum.S3) .setAllowedLocations(List.of("s3://my-old-bucket/path/to/data")) .build(); - io.polaris.core.admin.model.CatalogProperties.Builder catalogPropsBuilder = - io.polaris.core.admin.model.CatalogProperties.builder(catalogBaseLocation) + org.apache.polaris.core.admin.model.CatalogProperties.Builder catalogPropsBuilder = + org.apache.polaris.core.admin.model.CatalogProperties.builder(catalogBaseLocation) .addProperty( PolarisConfiguration.ALLOW_UNSTRUCTURED_TABLE_LOCATION.catalogConfig(), "true") diff --git a/polaris-service/src/test/java/io/polaris/service/catalog/PolarisRestCatalogViewIntegrationTest.java b/polaris-service/src/test/java/org/apache/polaris/service/catalog/PolarisRestCatalogViewIntegrationTest.java similarity index 89% rename from polaris-service/src/test/java/io/polaris/service/catalog/PolarisRestCatalogViewIntegrationTest.java rename to polaris-service/src/test/java/org/apache/polaris/service/catalog/PolarisRestCatalogViewIntegrationTest.java index faeea63d7c..9948a46e9f 100644 --- a/polaris-service/src/test/java/io/polaris/service/catalog/PolarisRestCatalogViewIntegrationTest.java +++ b/polaris-service/src/test/java/org/apache/polaris/service/catalog/PolarisRestCatalogViewIntegrationTest.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.catalog; +package org.apache.polaris.service.catalog; -import static io.polaris.service.context.DefaultContextResolver.REALM_PROPERTY_KEY; +import static org.apache.polaris.service.context.DefaultContextResolver.REALM_PROPERTY_KEY; import static org.assertj.core.api.Assertions.assertThat; import com.google.common.collect.ImmutableMap; @@ -26,24 +26,6 @@ import io.dropwizard.testing.ResourceHelpers; import io.dropwizard.testing.junit5.DropwizardAppExtension; import io.dropwizard.testing.junit5.DropwizardExtensionsSupport; -import io.polaris.core.PolarisConfiguration; -import io.polaris.core.admin.model.AwsStorageConfigInfo; -import io.polaris.core.admin.model.Catalog; -import io.polaris.core.admin.model.CatalogGrant; -import io.polaris.core.admin.model.CatalogPrivilege; -import io.polaris.core.admin.model.CatalogRole; -import io.polaris.core.admin.model.FileStorageConfigInfo; -import io.polaris.core.admin.model.GrantResource; -import io.polaris.core.admin.model.PolarisCatalog; -import io.polaris.core.admin.model.StorageConfigInfo; -import io.polaris.core.entity.CatalogEntity; -import io.polaris.service.PolarisApplication; -import io.polaris.service.auth.BasePolarisAuthenticator; -import io.polaris.service.config.PolarisApplicationConfig; -import io.polaris.service.test.PolarisConnectionExtension; -import io.polaris.service.test.PolarisConnectionExtension.PolarisToken; -import io.polaris.service.test.SnowmanCredentialsExtension; -import io.polaris.service.test.SnowmanCredentialsExtension.SnowmanCredentials; import jakarta.ws.rs.client.Entity; import jakarta.ws.rs.core.Response; import java.io.IOException; @@ -58,6 +40,24 @@ import org.apache.iceberg.rest.RESTCatalog; import org.apache.iceberg.rest.auth.OAuth2Properties; import org.apache.iceberg.view.ViewCatalogTests; +import org.apache.polaris.core.PolarisConfiguration; +import org.apache.polaris.core.admin.model.AwsStorageConfigInfo; +import org.apache.polaris.core.admin.model.Catalog; +import org.apache.polaris.core.admin.model.CatalogGrant; +import org.apache.polaris.core.admin.model.CatalogPrivilege; +import org.apache.polaris.core.admin.model.CatalogRole; +import org.apache.polaris.core.admin.model.FileStorageConfigInfo; +import org.apache.polaris.core.admin.model.GrantResource; +import org.apache.polaris.core.admin.model.PolarisCatalog; +import org.apache.polaris.core.admin.model.StorageConfigInfo; +import org.apache.polaris.core.entity.CatalogEntity; +import org.apache.polaris.service.PolarisApplication; +import org.apache.polaris.service.auth.BasePolarisAuthenticator; +import org.apache.polaris.service.config.PolarisApplicationConfig; +import org.apache.polaris.service.test.PolarisConnectionExtension; +import org.apache.polaris.service.test.PolarisConnectionExtension.PolarisToken; +import org.apache.polaris.service.test.SnowmanCredentialsExtension; +import org.apache.polaris.service.test.SnowmanCredentialsExtension.SnowmanCredentials; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.TestInfo; @@ -152,8 +152,8 @@ public void before( .setStorageType(StorageConfigInfo.StorageTypeEnum.S3) .setAllowedLocations(List.of("s3://my-old-bucket/path/to/data")) .build(); - io.polaris.core.admin.model.CatalogProperties props = - io.polaris.core.admin.model.CatalogProperties.builder( + org.apache.polaris.core.admin.model.CatalogProperties props = + org.apache.polaris.core.admin.model.CatalogProperties.builder( S3_BUCKET_BASE + "/" + System.getenv("USER") + "/path/to/data") .addProperty( CatalogEntity.REPLACE_NEW_LOCATION_PREFIX_WITH_CATALOG_DEFAULT_KEY, diff --git a/polaris-service/src/test/java/io/polaris/service/catalog/PolarisSparkIntegrationTest.java b/polaris-service/src/test/java/org/apache/polaris/service/catalog/PolarisSparkIntegrationTest.java similarity index 94% rename from polaris-service/src/test/java/io/polaris/service/catalog/PolarisSparkIntegrationTest.java rename to polaris-service/src/test/java/org/apache/polaris/service/catalog/PolarisSparkIntegrationTest.java index 6c531ecb62..b948820004 100644 --- a/polaris-service/src/test/java/io/polaris/service/catalog/PolarisSparkIntegrationTest.java +++ b/polaris-service/src/test/java/org/apache/polaris/service/catalog/PolarisSparkIntegrationTest.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.catalog; +package org.apache.polaris.service.catalog; -import static io.polaris.service.context.DefaultContextResolver.REALM_PROPERTY_KEY; +import static org.apache.polaris.service.context.DefaultContextResolver.REALM_PROPERTY_KEY; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -27,18 +27,6 @@ import io.dropwizard.testing.ResourceHelpers; import io.dropwizard.testing.junit5.DropwizardAppExtension; import io.dropwizard.testing.junit5.DropwizardExtensionsSupport; -import io.polaris.core.admin.model.AwsStorageConfigInfo; -import io.polaris.core.admin.model.Catalog; -import io.polaris.core.admin.model.CatalogProperties; -import io.polaris.core.admin.model.ExternalCatalog; -import io.polaris.core.admin.model.PolarisCatalog; -import io.polaris.core.admin.model.StorageConfigInfo; -import io.polaris.service.PolarisApplication; -import io.polaris.service.config.PolarisApplicationConfig; -import io.polaris.service.test.PolarisConnectionExtension; -import io.polaris.service.types.NotificationRequest; -import io.polaris.service.types.NotificationType; -import io.polaris.service.types.TableUpdateNotification; import jakarta.ws.rs.client.Entity; import jakarta.ws.rs.core.Response; import java.time.Instant; @@ -46,6 +34,18 @@ import java.util.Map; import org.apache.iceberg.rest.requests.ImmutableRegisterTableRequest; import org.apache.iceberg.rest.responses.LoadTableResponse; +import org.apache.polaris.core.admin.model.AwsStorageConfigInfo; +import org.apache.polaris.core.admin.model.Catalog; +import org.apache.polaris.core.admin.model.CatalogProperties; +import org.apache.polaris.core.admin.model.ExternalCatalog; +import org.apache.polaris.core.admin.model.PolarisCatalog; +import org.apache.polaris.core.admin.model.StorageConfigInfo; +import org.apache.polaris.service.PolarisApplication; +import org.apache.polaris.service.config.PolarisApplicationConfig; +import org.apache.polaris.service.test.PolarisConnectionExtension; +import org.apache.polaris.service.types.NotificationRequest; +import org.apache.polaris.service.types.NotificationType; +import org.apache.polaris.service.types.TableUpdateNotification; import org.apache.spark.sql.Dataset; import org.apache.spark.sql.Row; import org.apache.spark.sql.SparkSession; diff --git a/polaris-service/src/test/java/io/polaris/service/entity/CatalogEntityTest.java b/polaris-service/src/test/java/org/apache/polaris/service/entity/CatalogEntityTest.java similarity index 94% rename from polaris-service/src/test/java/io/polaris/service/entity/CatalogEntityTest.java rename to polaris-service/src/test/java/org/apache/polaris/service/entity/CatalogEntityTest.java index dd8cd1554e..10f8eb525a 100644 --- a/polaris-service/src/test/java/io/polaris/service/entity/CatalogEntityTest.java +++ b/polaris-service/src/test/java/org/apache/polaris/service/entity/CatalogEntityTest.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.entity; +package org.apache.polaris.service.entity; -import io.polaris.core.admin.model.AwsStorageConfigInfo; -import io.polaris.core.admin.model.AzureStorageConfigInfo; -import io.polaris.core.admin.model.Catalog; -import io.polaris.core.admin.model.CatalogProperties; -import io.polaris.core.admin.model.GcpStorageConfigInfo; -import io.polaris.core.admin.model.PolarisCatalog; -import io.polaris.core.admin.model.StorageConfigInfo; -import io.polaris.core.entity.CatalogEntity; import java.util.List; +import org.apache.polaris.core.admin.model.AwsStorageConfigInfo; +import org.apache.polaris.core.admin.model.AzureStorageConfigInfo; +import org.apache.polaris.core.admin.model.Catalog; +import org.apache.polaris.core.admin.model.CatalogProperties; +import org.apache.polaris.core.admin.model.GcpStorageConfigInfo; +import org.apache.polaris.core.admin.model.PolarisCatalog; +import org.apache.polaris.core.admin.model.StorageConfigInfo; +import org.apache.polaris.core.entity.CatalogEntity; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/polaris-service/src/test/java/io/polaris/service/task/ManifestFileCleanupTaskHandlerTest.java b/polaris-service/src/test/java/org/apache/polaris/service/task/ManifestFileCleanupTaskHandlerTest.java similarity index 95% rename from polaris-service/src/test/java/io/polaris/service/task/ManifestFileCleanupTaskHandlerTest.java rename to polaris-service/src/test/java/org/apache/polaris/service/task/ManifestFileCleanupTaskHandlerTest.java index c79c349428..7fb61cded9 100644 --- a/polaris-service/src/test/java/io/polaris/service/task/ManifestFileCleanupTaskHandlerTest.java +++ b/polaris-service/src/test/java/org/apache/polaris/service/task/ManifestFileCleanupTaskHandlerTest.java @@ -16,18 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.task; +package org.apache.polaris.service.task; import static java.nio.charset.StandardCharsets.UTF_8; import static org.assertj.core.api.Assertions.assertThatPredicate; -import io.polaris.core.PolarisCallContext; -import io.polaris.core.PolarisDefaultDiagServiceImpl; -import io.polaris.core.context.CallContext; -import io.polaris.core.context.RealmContext; -import io.polaris.core.entity.AsyncTaskType; -import io.polaris.core.entity.TaskEntity; -import io.polaris.service.persistence.InMemoryPolarisMetaStoreManagerFactory; import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -43,6 +36,13 @@ import org.apache.iceberg.io.FileIO; import org.apache.iceberg.io.OutputFile; import org.apache.iceberg.io.PositionOutputStream; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.PolarisDefaultDiagServiceImpl; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.context.RealmContext; +import org.apache.polaris.core.entity.AsyncTaskType; +import org.apache.polaris.core.entity.TaskEntity; +import org.apache.polaris.service.persistence.InMemoryPolarisMetaStoreManagerFactory; import org.junit.jupiter.api.Test; class ManifestFileCleanupTaskHandlerTest { diff --git a/polaris-service/src/test/java/io/polaris/service/task/TableCleanupTaskHandlerTest.java b/polaris-service/src/test/java/org/apache/polaris/service/task/TableCleanupTaskHandlerTest.java similarity index 96% rename from polaris-service/src/test/java/io/polaris/service/task/TableCleanupTaskHandlerTest.java rename to polaris-service/src/test/java/org/apache/polaris/service/task/TableCleanupTaskHandlerTest.java index d491cfc770..d106a26e0f 100644 --- a/polaris-service/src/test/java/io/polaris/service/task/TableCleanupTaskHandlerTest.java +++ b/polaris-service/src/test/java/org/apache/polaris/service/task/TableCleanupTaskHandlerTest.java @@ -16,20 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.task; +package org.apache.polaris.service.task; import static org.assertj.core.api.Assertions.assertThat; -import io.polaris.core.PolarisCallContext; -import io.polaris.core.PolarisDefaultDiagServiceImpl; -import io.polaris.core.context.CallContext; -import io.polaris.core.context.RealmContext; -import io.polaris.core.entity.AsyncTaskType; -import io.polaris.core.entity.PolarisBaseEntity; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.entity.TableLikeEntity; -import io.polaris.core.entity.TaskEntity; -import io.polaris.service.persistence.InMemoryPolarisMetaStoreManagerFactory; import java.io.IOException; import java.util.List; import org.apache.commons.codec.binary.Base64; @@ -40,6 +30,16 @@ import org.apache.iceberg.catalog.TableIdentifier; import org.apache.iceberg.inmemory.InMemoryFileIO; import org.apache.iceberg.io.FileIO; +import org.apache.polaris.core.PolarisCallContext; +import org.apache.polaris.core.PolarisDefaultDiagServiceImpl; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.context.RealmContext; +import org.apache.polaris.core.entity.AsyncTaskType; +import org.apache.polaris.core.entity.PolarisBaseEntity; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.entity.TableLikeEntity; +import org.apache.polaris.core.entity.TaskEntity; +import org.apache.polaris.service.persistence.InMemoryPolarisMetaStoreManagerFactory; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/polaris-service/src/test/java/io/polaris/service/task/TaskTestUtils.java b/polaris-service/src/test/java/org/apache/polaris/service/task/TaskTestUtils.java similarity index 98% rename from polaris-service/src/test/java/io/polaris/service/task/TaskTestUtils.java rename to polaris-service/src/test/java/org/apache/polaris/service/task/TaskTestUtils.java index 03e2571983..1e5612e254 100644 --- a/polaris-service/src/test/java/io/polaris/service/task/TaskTestUtils.java +++ b/polaris-service/src/test/java/org/apache/polaris/service/task/TaskTestUtils.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.task; +package org.apache.polaris.service.task; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/polaris-service/src/test/java/io/polaris/service/task/TestSnapshot.java b/polaris-service/src/test/java/org/apache/polaris/service/task/TestSnapshot.java similarity index 98% rename from polaris-service/src/test/java/io/polaris/service/task/TestSnapshot.java rename to polaris-service/src/test/java/org/apache/polaris/service/task/TestSnapshot.java index f0d57a0b74..9ecf310c58 100644 --- a/polaris-service/src/test/java/io/polaris/service/task/TestSnapshot.java +++ b/polaris-service/src/test/java/org/apache/polaris/service/task/TestSnapshot.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.task; +package org.apache.polaris.service.task; import com.google.common.collect.Lists; import java.io.IOException; diff --git a/polaris-service/src/test/java/io/polaris/service/test/PolarisConnectionExtension.java b/polaris-service/src/test/java/org/apache/polaris/service/test/PolarisConnectionExtension.java similarity index 88% rename from polaris-service/src/test/java/io/polaris/service/test/PolarisConnectionExtension.java rename to polaris-service/src/test/java/org/apache/polaris/service/test/PolarisConnectionExtension.java index d9b0d4d49c..30f0a9aeb7 100644 --- a/polaris-service/src/test/java/io/polaris/service/test/PolarisConnectionExtension.java +++ b/polaris-service/src/test/java/org/apache/polaris/service/test/PolarisConnectionExtension.java @@ -16,32 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.test; +package org.apache.polaris.service.test; -import static io.polaris.service.context.DefaultContextResolver.REALM_PROPERTY_KEY; +import static org.apache.polaris.service.context.DefaultContextResolver.REALM_PROPERTY_KEY; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import io.dropwizard.testing.junit5.DropwizardAppExtension; -import io.polaris.core.PolarisDiagnostics; -import io.polaris.core.context.CallContext; -import io.polaris.core.context.RealmContext; -import io.polaris.core.entity.PolarisEntityConstants; -import io.polaris.core.entity.PolarisEntitySubType; -import io.polaris.core.entity.PolarisEntityType; -import io.polaris.core.entity.PolarisGrantRecord; -import io.polaris.core.entity.PolarisPrincipalSecrets; -import io.polaris.core.persistence.LocalPolarisMetaStoreManagerFactory; -import io.polaris.core.persistence.MetaStoreManagerFactory; -import io.polaris.core.persistence.PolarisMetaStoreManager; -import io.polaris.core.storage.PolarisCredentialProperty; -import io.polaris.core.storage.PolarisStorageActions; -import io.polaris.core.storage.PolarisStorageConfigurationInfo; -import io.polaris.core.storage.PolarisStorageIntegration; -import io.polaris.core.storage.PolarisStorageIntegrationProvider; -import io.polaris.service.auth.TokenUtils; -import io.polaris.service.config.PolarisApplicationConfig; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.Arrays; @@ -49,6 +31,24 @@ import java.util.Map; import java.util.Optional; import java.util.Set; +import org.apache.polaris.core.PolarisDiagnostics; +import org.apache.polaris.core.context.CallContext; +import org.apache.polaris.core.context.RealmContext; +import org.apache.polaris.core.entity.PolarisEntityConstants; +import org.apache.polaris.core.entity.PolarisEntitySubType; +import org.apache.polaris.core.entity.PolarisEntityType; +import org.apache.polaris.core.entity.PolarisGrantRecord; +import org.apache.polaris.core.entity.PolarisPrincipalSecrets; +import org.apache.polaris.core.persistence.LocalPolarisMetaStoreManagerFactory; +import org.apache.polaris.core.persistence.MetaStoreManagerFactory; +import org.apache.polaris.core.persistence.PolarisMetaStoreManager; +import org.apache.polaris.core.storage.PolarisCredentialProperty; +import org.apache.polaris.core.storage.PolarisStorageActions; +import org.apache.polaris.core.storage.PolarisStorageConfigurationInfo; +import org.apache.polaris.core.storage.PolarisStorageIntegration; +import org.apache.polaris.core.storage.PolarisStorageIntegrationProvider; +import org.apache.polaris.service.auth.TokenUtils; +import org.apache.polaris.service.config.PolarisApplicationConfig; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.junit.jupiter.api.extension.BeforeAllCallback; diff --git a/polaris-service/src/test/java/io/polaris/service/test/SnowmanCredentialsExtension.java b/polaris-service/src/test/java/org/apache/polaris/service/test/SnowmanCredentialsExtension.java similarity index 94% rename from polaris-service/src/test/java/io/polaris/service/test/SnowmanCredentialsExtension.java rename to polaris-service/src/test/java/org/apache/polaris/service/test/SnowmanCredentialsExtension.java index 38e30b6b41..fcd4f3956b 100644 --- a/polaris-service/src/test/java/io/polaris/service/test/SnowmanCredentialsExtension.java +++ b/polaris-service/src/test/java/org/apache/polaris/service/test/SnowmanCredentialsExtension.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package io.polaris.service.test; +package org.apache.polaris.service.test; -import static io.polaris.service.context.DefaultContextResolver.REALM_PROPERTY_KEY; +import static org.apache.polaris.service.context.DefaultContextResolver.REALM_PROPERTY_KEY; import static org.assertj.core.api.Assertions.assertThat; import io.dropwizard.testing.junit5.DropwizardAppExtension; -import io.polaris.core.admin.model.GrantPrincipalRoleRequest; -import io.polaris.core.admin.model.Principal; -import io.polaris.core.admin.model.PrincipalRole; -import io.polaris.core.admin.model.PrincipalWithCredentials; -import io.polaris.core.entity.PolarisPrincipalSecrets; -import io.polaris.service.auth.TokenUtils; import jakarta.ws.rs.client.Entity; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; +import org.apache.polaris.core.admin.model.GrantPrincipalRoleRequest; +import org.apache.polaris.core.admin.model.Principal; +import org.apache.polaris.core.admin.model.PrincipalRole; +import org.apache.polaris.core.admin.model.PrincipalWithCredentials; +import org.apache.polaris.core.entity.PolarisPrincipalSecrets; +import org.apache.polaris.service.auth.TokenUtils; import org.junit.jupiter.api.extension.AfterAllCallback; import org.junit.jupiter.api.extension.BeforeAllCallback; import org.junit.jupiter.api.extension.ExtensionContext; diff --git a/polaris-service/src/test/resources/META-INF/services/io.polaris.service.auth.DiscoverableAuthenticator b/polaris-service/src/test/resources/META-INF/services/org.apache.polaris.service.auth.DiscoverableAuthenticator similarity index 91% rename from polaris-service/src/test/resources/META-INF/services/io.polaris.service.auth.DiscoverableAuthenticator rename to polaris-service/src/test/resources/META-INF/services/org.apache.polaris.service.auth.DiscoverableAuthenticator index a47d2c6bb6..c8652a6266 100644 --- a/polaris-service/src/test/resources/META-INF/services/io.polaris.service.auth.DiscoverableAuthenticator +++ b/polaris-service/src/test/resources/META-INF/services/org.apache.polaris.service.auth.DiscoverableAuthenticator @@ -17,4 +17,4 @@ # under the License. # -io.polaris.service.auth.TestInlineBearerTokenPolarisAuthenticator \ No newline at end of file +org.apache.polaris.service.auth.TestInlineBearerTokenPolarisAuthenticator \ No newline at end of file diff --git a/polaris-service/src/test/resources/polaris-server-integrationtest.yml b/polaris-service/src/test/resources/polaris-server-integrationtest.yml index f79873cf91..ebeaf9c74e 100644 --- a/polaris-service/src/test/resources/polaris-server-integrationtest.yml +++ b/polaris-service/src/test/resources/polaris-server-integrationtest.yml @@ -96,7 +96,7 @@ oauth2: # clientSecret2: ${GS_POLARIS_SERVICE_CLIENT_SECRET2} authenticator: - class: io.polaris.service.auth.DefaultPolarisAuthenticator + class: org.apache.polaris.service.auth.DefaultPolarisAuthenticator tokenBroker: type: symmetric-key secret: polaris @@ -132,7 +132,7 @@ logging: # Logger-specific levels. loggers: - io.polaris: DEBUG + org.apache.polaris: DEBUG appenders: diff --git a/server-templates/api.mustache b/server-templates/api.mustache index e18b7eef6a..929dd6ddaa 100644 --- a/server-templates/api.mustache +++ b/server-templates/api.mustache @@ -22,7 +22,7 @@ package {{package}}; import {{import}}; {{/imports}} -import io.polaris.core.resource.TimedApi; +import org.apache.polaris.core.resource.TimedApi; import java.util.Map; import java.util.List;