From ebfcb90bf0f853981313b2bbc2260233378d1481 Mon Sep 17 00:00:00 2001 From: Honah J Date: Tue, 4 Mar 2025 23:07:59 -0800 Subject: [PATCH] Changing signature to make parameter order correct --- .../TransactionWorkspaceMetaStoreManager.java | 10 +++++----- .../PolarisMetaStoreManagerImpl.java | 10 +++++----- .../policy/PolarisPolicyMappingManager.java | 18 +++++++++--------- .../PolarisTestMetaStoreManager.java | 10 +++++----- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/TransactionWorkspaceMetaStoreManager.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/TransactionWorkspaceMetaStoreManager.java index df3302723..05c8a6e00 100644 --- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/TransactionWorkspaceMetaStoreManager.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/TransactionWorkspaceMetaStoreManager.java @@ -387,10 +387,10 @@ public ResolvedEntityResult refreshResolvedEntity( @Override public @NotNull AttachmentResult attachPolicyToEntity( @Nonnull PolarisCallContext callCtx, - @NotNull PolarisEntityCore target, @NotNull List targetCatalogPath, - @NotNull PolicyEntity policy, + @NotNull PolarisEntityCore target, @NotNull List policyCatalogPath, + @NotNull PolicyEntity policy, Map parameters) { callCtx .getDiagServices() @@ -401,10 +401,10 @@ public ResolvedEntityResult refreshResolvedEntity( @Override public @NotNull AttachmentResult detachPolicyFromEntity( @Nonnull PolarisCallContext callCtx, - @NotNull PolarisEntityCore target, @NotNull List catalogPath, - @NotNull PolicyEntity policy, - @NotNull List policyCatalogPath) { + @NotNull PolarisEntityCore target, + @NotNull List policyCatalogPath, + @NotNull PolicyEntity policy) { callCtx .getDiagServices() .fail("illegal_method_in_transaction_workspace", "detachPolicyFromEntity"); diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/PolarisMetaStoreManagerImpl.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/PolarisMetaStoreManagerImpl.java index 654a69079..ebc22ab41 100644 --- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/PolarisMetaStoreManagerImpl.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/transactional/PolarisMetaStoreManagerImpl.java @@ -2354,10 +2354,10 @@ public Map getInternalPropertyMap( @Override public @NotNull AttachmentResult attachPolicyToEntity( @Nonnull PolarisCallContext callCtx, - @Nonnull PolarisEntityCore target, @Nonnull List targetCatalogPath, - @Nonnull PolicyEntity policy, + @Nonnull PolarisEntityCore target, @Nonnull List policyCatalogPath, + @Nonnull PolicyEntity policy, Map parameters) { TransactionalPersistence ms = callCtx.getMetaStore(); @@ -2439,10 +2439,10 @@ public Map getInternalPropertyMap( @Override public @NotNull AttachmentResult detachPolicyFromEntity( @Nonnull PolarisCallContext callCtx, - @Nonnull PolarisEntityCore target, @Nonnull List targetCatalogPath, - @Nonnull PolicyEntity policy, - @Nonnull List policyCatalogPath) { + @Nonnull PolarisEntityCore target, + @Nonnull List policyCatalogPath, + @Nonnull PolicyEntity policy) { TransactionalPersistence ms = callCtx.getMetaStore(); return ms.runInTransaction( callCtx, diff --git a/polaris-core/src/main/java/org/apache/polaris/core/policy/PolarisPolicyMappingManager.java b/polaris-core/src/main/java/org/apache/polaris/core/policy/PolarisPolicyMappingManager.java index 7a73bd9ca..fc4cb6a06 100644 --- a/polaris-core/src/main/java/org/apache/polaris/core/policy/PolarisPolicyMappingManager.java +++ b/polaris-core/src/main/java/org/apache/polaris/core/policy/PolarisPolicyMappingManager.java @@ -39,10 +39,10 @@ public interface PolarisPolicyMappingManager { * non-inheritable policy, multiple policies of the same type can be attached to the target. * * @param callCtx call context - * @param target target entity * @param targetCatalogPath path to the target entity - * @param policy policy entity + * @param target target entity * @param policyCatalogPath path to the policy entity + * @param policy policy entity * @param parameters additional parameters for the attachment * @return The policy mapping record we created for this attachment. Will return ENTITY_NOT_FOUND * if the specified target or policy does not exist. Will return @@ -52,20 +52,20 @@ public interface PolarisPolicyMappingManager { @Nonnull AttachmentResult attachPolicyToEntity( @Nonnull PolarisCallContext callCtx, - @Nonnull PolarisEntityCore target, @Nonnull List targetCatalogPath, - @Nonnull PolicyEntity policy, + @Nonnull PolarisEntityCore target, @Nonnull List policyCatalogPath, + @Nonnull PolicyEntity policy, Map parameters); /** * Detach a policy from a target entity * * @param callCtx call context - * @param target target entity * @param catalogPath path to the target entity - * @param policy policy entity + * @param target target entity * @param policyCatalogPath path to the policy entity + * @param policy policy entity * @return The policy mapping record we detached. Will return ENTITY_NOT_FOUND if the specified * target or policy does not exist. Will return POLICY_MAPPING_NOT_FOUND if the mapping cannot * be found @@ -73,10 +73,10 @@ AttachmentResult attachPolicyToEntity( @Nonnull AttachmentResult detachPolicyFromEntity( @Nonnull PolarisCallContext callCtx, - @Nonnull PolarisEntityCore target, @Nonnull List catalogPath, - @Nonnull PolicyEntity policy, - @Nonnull List policyCatalogPath); + @Nonnull PolarisEntityCore target, + @Nonnull List policyCatalogPath, + @Nonnull PolicyEntity policy); /** * Load all policies attached to a target entity diff --git a/polaris-core/src/testFixtures/java/org/apache/polaris/core/persistence/PolarisTestMetaStoreManager.java b/polaris-core/src/testFixtures/java/org/apache/polaris/core/persistence/PolarisTestMetaStoreManager.java index ee4e0947e..ddb8522ac 100644 --- a/polaris-core/src/testFixtures/java/org/apache/polaris/core/persistence/PolarisTestMetaStoreManager.java +++ b/polaris-core/src/testFixtures/java/org/apache/polaris/core/persistence/PolarisTestMetaStoreManager.java @@ -2327,10 +2327,10 @@ void testPolicyMapping() { polarisMetaStoreManager.attachPolicyToEntity( polarisCallContext, - N1_N2_T1, List.of(catalog, N1, N1_N2), - PolicyEntity.of(N1_P1), + N1_N2_T1, List.of(catalog, N1), + PolicyEntity.of(N1_P1), null); PolarisPolicyMappingManager.LoadPolicyMappingsResult directSearch = polarisMetaStoreManager.loadPoliciesOnEntity(polarisCallContext, N1_N2_T1); @@ -2351,10 +2351,10 @@ void testPolicyMapping() { .isEqualTo(PredefinedPolicyType.DATA_COMPACTION); polarisMetaStoreManager.detachPolicyFromEntity( polarisCallContext, - N1_N2_T1, List.of(catalog, N1, N1_N2), - PolicyEntity.of(N1_P1), - List.of(catalog, N1)); + N1_N2_T1, + List.of(catalog, N1), + PolicyEntity.of(N1_P1)); PolarisPolicyMappingManager.LoadPolicyMappingsResult emptySearch = polarisMetaStoreManager.loadPoliciesOnEntity(polarisCallContext, N1_N2_T1); Assertions.assertThat(emptySearch.getPolicyEntities()).isEmpty();