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

Cleanup/fix jackson 2 -> 3 migration (#3024)

Browse Source 
Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2026-04-16 13:29:26 +03:00
committed by GitHub
parent 000dd97bbc
commit 37559cdedc
50 changed files with 442 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
hawkbit-core/src/main/java/org/eclipse/hawkbit/auth/StaticAuthenticationProvider.java
View File

@@ -20,6 +20,7 @@ import java.util.regex.Pattern;
import org.eclipse.hawkbit.tenancy.TenantAwareAuthenticationDetails;
import org.eclipse.hawkbit.tenancy.TenantAwareUser;
import org.eclipse.hawkbit.tenancy.TenantAwareUserProperties;
import org.jspecify.annotations.NonNull;
import org.springframework.boot.security.autoconfigure.SecurityProperties;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
@@ -44,7 +45,8 @@ public class StaticAuthenticationProvider extends DaoAuthenticationProvider {
}
@Override
protected Authentication createSuccessAuthentication(final Object principal, final Authentication authentication, final UserDetails user) {
protected @NonNull Authentication createSuccessAuthentication(
@NonNull final Object principal, final Authentication authentication, final UserDetails user) {
final UsernamePasswordAuthenticationToken result = new UsernamePasswordAuthenticationToken(
principal, authentication.getCredentials(), user.getAuthorities());
result.setDetails(user instanceof TenantAwareUser tenantAwareUser
@@ -58,15 +60,13 @@ public class StaticAuthenticationProvider extends DaoAuthenticationProvider {
final List<User> userPrincipals = new ArrayList<>();
tenantAwareUserProperties.getUser().forEach((username, user) -> {
final String password = password(user.getPassword());
final List<GrantedAuthority> credentials =
createAuthorities(user.getRoles(), user.getPermissions(), Collections::emptyList);
final List<GrantedAuthority> credentials = createAuthorities(user.getRoles(), user.getPermissions(), Collections::emptyList);
userPrincipals.add(ObjectUtils.isEmpty(user.getTenant())
? new User(username, password, credentials)
: new TenantAwareUser(username, password, credentials, user.getTenant()));
});
if (securityProperties != null && securityProperties.getUser() != null && !securityProperties.getUser().isPasswordGenerated()) {
if (securityProperties != null && !securityProperties.getUser().isPasswordGenerated()) {
// explicitly setup system user - add is as a regular (non-tenant scoped) user
userPrincipals.add(new User(
securityProperties.getUser().getName(),
@@ -119,7 +119,7 @@ public class StaticAuthenticationProvider extends DaoAuthenticationProvider {
}
@Override
public UserDetails loadUserByUsername(final String username) {
public @NonNull UserDetails loadUserByUsername(@NonNull final String username) {
final User user = userMap.get(username);
if (user == null) {
throw new UsernameNotFoundException("No such user");

2
hawkbit-core/src/main/resources/hawkbit-jackson-defaults.properties
View File

@@ -8,7 +8,7 @@
# SPDX-License-Identifier: EPL-2.0
#
# sets MapperFeature.ALLOW_FINAL_FIELDS_AS_MUTATORS to true
# sets MapperFeature.ALLOW_FINAL_FIELDS_AS_MUTATORS to true, jackson 3 doesn't override finals which we need
spring.jackson.mapper.allow-final-fields-as-mutators=true
# sets DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY to true
# this feature allow sending single value instead of array of single value for array fields.