lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix RoleHierarchyImpl deprecation (#1849)

Browse Source 
Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2024-10-01 10:32:03 +03:00
committed by GitHub
parent 90898b146d
commit 4bc082599b
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityAutoConfiguration.java
View File

@@ -157,9 +157,7 @@ public class SecurityAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean
static RoleHierarchy roleHierarchy() { static RoleHierarchy roleHierarchy() {
final RoleHierarchyImpl hierarchy = new RoleHierarchyImpl(); return RoleHierarchyImpl.fromHierarchy(SpRole.DEFAULT_ROLE_HIERARCHY);
hierarchy.setHierarchy(SpRole.DEFAULT_ROLE_HIERARCHY);
return hierarchy;
} }
// and, if using method security also add // and, if using method security also add

4
hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/TestConfiguration.java
View File

@@ -106,9 +106,7 @@ public class TestConfiguration implements AsyncConfigurer {
@Bean @Bean
SystemSecurityContext systemSecurityContext(final TenantAware tenantAware) { SystemSecurityContext systemSecurityContext(final TenantAware tenantAware) {
final RoleHierarchyImpl hierarchy = new RoleHierarchyImpl(); return new SystemSecurityContext(tenantAware, RoleHierarchyImpl.fromHierarchy(SpRole.DEFAULT_ROLE_HIERARCHY));
hierarchy.setHierarchy(SpRole.DEFAULT_ROLE_HIERARCHY);
return new SystemSecurityContext(tenantAware, hierarchy);
} }
@Bean @Bean