From 4bc082599bc3f88c77b500d875063bcfc6cdd95a Mon Sep 17 00:00:00 2001 From: Avgustin Marinov Date: Tue, 1 Oct 2024 10:32:03 +0300 Subject: [PATCH] Fix RoleHierarchyImpl deprecation (#1849) Signed-off-by: Marinov Avgustin --- .../autoconfigure/security/SecurityAutoConfiguration.java | 4 +--- .../eclipse/hawkbit/repository/test/TestConfiguration.java | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityAutoConfiguration.java b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityAutoConfiguration.java index 3c2b52675..0e1d97945 100644 --- a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityAutoConfiguration.java +++ b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityAutoConfiguration.java @@ -157,9 +157,7 @@ public class SecurityAutoConfiguration { @Bean @ConditionalOnMissingBean static RoleHierarchy roleHierarchy() { - final RoleHierarchyImpl hierarchy = new RoleHierarchyImpl(); - hierarchy.setHierarchy(SpRole.DEFAULT_ROLE_HIERARCHY); - return hierarchy; + return RoleHierarchyImpl.fromHierarchy(SpRole.DEFAULT_ROLE_HIERARCHY); } // and, if using method security also add diff --git a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/TestConfiguration.java b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/TestConfiguration.java index 6d5070d01..facf1ab2f 100644 --- a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/TestConfiguration.java +++ b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/TestConfiguration.java @@ -106,9 +106,7 @@ public class TestConfiguration implements AsyncConfigurer { @Bean SystemSecurityContext systemSecurityContext(final TenantAware tenantAware) { - final RoleHierarchyImpl hierarchy = new RoleHierarchyImpl(); - hierarchy.setHierarchy(SpRole.DEFAULT_ROLE_HIERARCHY); - return new SystemSecurityContext(tenantAware, hierarchy); + return new SystemSecurityContext(tenantAware, RoleHierarchyImpl.fromHierarchy(SpRole.DEFAULT_ROLE_HIERARCHY)); } @Bean