From b658f954664e0fbae765ce6111ae931fcf3680f1 Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Wed, 29 Oct 2025 08:44:54 +0200 Subject: [PATCH] Rename ACTION_PURGE_PERCENTAGE_ON_QUOTA_HIT to ACTION_CLEANUP_ON_QUOTA_HIT_PERCENTAGE - to match real value (#2787) Signed-off-by: Avgustin Marinov --- .../configuration/TenantConfigurationProperties.java | 2 +- .../repository/jpa/management/JpaDeploymentManagement.java | 3 +-- .../repository/jpa/management/DeploymentManagementTest.java | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/TenantConfigurationProperties.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/TenantConfigurationProperties.java index b287f6ccc..f2da6ea60 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/TenantConfigurationProperties.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/TenantConfigurationProperties.java @@ -115,7 +115,7 @@ public class TenantConfigurationProperties { /** * Configuration value for percentage of oldest actions to be cleaned if @maxActionsPerTarget quota is hit */ - public static final String ACTION_PURGE_PERCENTAGE_ON_QUOTA_HIT = "action.cleanup.onQuotaHit.percent"; + public static final String ACTION_CLEANUP_ON_QUOTA_HIT_PERCENTAGE = "action.cleanup.onQuotaHit.percent"; /** * Switch to enable/disable the multi-assignment feature. */ diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaDeploymentManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaDeploymentManagement.java index 402e675a2..0d51367cb 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaDeploymentManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaDeploymentManagement.java @@ -88,7 +88,6 @@ import org.eclipse.hawkbit.repository.model.TargetUpdateStatus; import org.eclipse.hawkbit.repository.model.TargetWithActionType; import org.eclipse.hawkbit.security.SystemSecurityContext; import org.eclipse.hawkbit.tenancy.TenantAware; -import org.eclipse.hawkbit.tenancy.configuration.TenantConfigurationProperties; import org.eclipse.hawkbit.tenancy.configuration.TenantConfigurationProperties.TenantConfigurationKey; import org.eclipse.hawkbit.utils.TenantConfigHelper; import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty; @@ -629,7 +628,7 @@ public class JpaDeploymentManagement extends JpaActionManagement implements Depl } private int getActionsPurgePercentage() { - return getConfigValue(TenantConfigurationKey.ACTION_PURGE_PERCENTAGE_ON_QUOTA_HIT, Integer.class); + return getConfigValue(TenantConfigurationKey.ACTION_CLEANUP_ON_QUOTA_HIT_PERCENTAGE, Integer.class); } protected boolean isActionsAutocloseEnabled() { diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/DeploymentManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/DeploymentManagementTest.java index be3321c23..ee0123dc1 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/DeploymentManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/management/DeploymentManagementTest.java @@ -1649,7 +1649,7 @@ class DeploymentManagementTest extends AbstractJpaIntegrationTest { () -> assignDistributionSet(exceededQuotaDsAssign.getId(), target.getControllerId())); // set purge config to 25 % - tenantConfigurationManagement.addOrUpdateConfiguration(TenantConfigurationKey.ACTION_PURGE_PERCENTAGE_ON_QUOTA_HIT, 25); + tenantConfigurationManagement.addOrUpdateConfiguration(TenantConfigurationKey.ACTION_CLEANUP_ON_QUOTA_HIT_PERCENTAGE, 25); // assign again assignDistributionSet(exceededQuotaDsAssign.getId(), target.getControllerId()); @@ -1688,7 +1688,7 @@ class DeploymentManagementTest extends AbstractJpaIntegrationTest { assertEquals(20, deploymentManagement.countActionsByTarget(target.getControllerId())); // set purge config to 25 % - tenantConfigurationManagement.addOrUpdateConfiguration(TenantConfigurationKey.ACTION_PURGE_PERCENTAGE_ON_QUOTA_HIT, 25); + tenantConfigurationManagement.addOrUpdateConfiguration(TenantConfigurationKey.ACTION_CLEANUP_ON_QUOTA_HIT_PERCENTAGE, 25); rolloutHandler.handleAll(); assertEquals(16, deploymentManagement.countActionsByTarget(target.getControllerId())); @@ -1709,7 +1709,7 @@ class DeploymentManagementTest extends AbstractJpaIntegrationTest { rolloutHandler.handleAll(); } - tenantConfigurationManagement.addOrUpdateConfiguration(TenantConfigurationKey.ACTION_PURGE_PERCENTAGE_ON_QUOTA_HIT, 25); + tenantConfigurationManagement.addOrUpdateConfiguration(TenantConfigurationKey.ACTION_CLEANUP_ON_QUOTA_HIT_PERCENTAGE, 25); deploymentManagement.handleMaxAssignmentsExceeded(target.getId(), 5L, new AssignmentQuotaExceededException()); // only 3 actions should be deleted in such case : assertEquals(15, deploymentManagement.countActionsByTarget(target.getControllerId()));