@Override @Transactional public List<UserSetting> getUserSettings( User user ) { if ( user == null ) { return new ArrayList<>(); } List<UserSetting> userSettings = userSettingStore.getAllUserSettings( user ); Set<UserSetting> defaultUserSettings = UserSettingKey.getDefaultUserSettings( user ); userSettings.addAll( defaultUserSettings.stream().filter( x -> !userSettings.contains( x ) ).collect( Collectors.toList() ) ); return userSettings; }