gCubeSystem
/
keycloak-d4science-spi-parent
17
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor optimizations and more talking logs messages

This commit is contained in:
Mauro Mugnaini 2023-10-09 17:14:41 +02:00
parent efea30e5e5
commit 157e5f46aa
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
avatar-realm-resource/src/main/java/org/gcube/keycloak/avatar/storage/file/FileAvatarStorageProvider.java
View File

@ -38,15 +38,17 @@ public class FileAvatarStorageProvider implements AvatarStorageProvider {
public void saveAvatarImage(RealmModel realm, UserModel user, InputStream input) { public void saveAvatarImage(RealmModel realm, UserModel user, InputStream input) {
checkRealmFolderExistence(realm.getName()); checkRealmFolderExistence(realm.getName());
File avatarFile = getAvatarFile(realm, user); File avatarFile = getAvatarFile(realm, user);
logger.debugf("Saving new avatar file for user %s, file path is: %s", user.getUsername(),
avatarFile.getAbsolutePath());
if (!avatarFile.exists()) { if (!avatarFile.exists()) {
logger.debugf("Saving new avatar file for user %s, file path is: %s", user.getUsername(),
avatarFile.getAbsolutePath());
try { try {
avatarFile.createNewFile(); avatarFile.createNewFile();
} catch (IOException e) { } catch (IOException e) {
logger.error("Cannot create new avater file", e); logger.error("Cannot create new avater file", e);
} }
} else {
logger.debugf("Overwriting avatar file with new image for user %s, file path is: %s", user.getUsername(),
avatarFile.getAbsolutePath());
} }
try (FileOutputStream fos = new FileOutputStream(avatarFile)) { try (FileOutputStream fos = new FileOutputStream(avatarFile)) {
IOUtils.copy(input, fos); IOUtils.copy(input, fos);
@ -58,7 +60,7 @@ public class FileAvatarStorageProvider implements AvatarStorageProvider {
private void checkRealmFolderExistence(String realmName) { private void checkRealmFolderExistence(String realmName) {
File realmFile = new File(avatarFolder, realmName); File realmFile = new File(avatarFolder, realmName);
if (!realmFile.exists()) { if (!realmFile.exists()) {
logger.infof("Creating avatar folder for realm '%s' in %s", realmName, realmFile.getAbsolutePath()); logger.infof("Creating avatar folder for realm '%s' as %s", realmName, realmFile.getAbsolutePath());
realmFile.mkdir(); realmFile.mkdir();
} }
} }
@ -66,15 +68,8 @@ public class FileAvatarStorageProvider implements AvatarStorageProvider {
@Override @Override
public InputStream loadAvatarImage(RealmModel realm, UserModel user) { public InputStream loadAvatarImage(RealmModel realm, UserModel user) {
checkRealmFolderExistence(realm.getName()); checkRealmFolderExistence(realm.getName());
File avatarFile = getAvatarFile(realm, user);
if (avatarFile.exists()) {
logger.debugf("Loading avatar file for user %s, file path is: %s", user.getUsername(),
avatarFile.getAbsolutePath());
} else {
logger.debugf("Avatar file not found for user %s", user.getUsername());
}
try { try {
return new FileInputStream(avatarFile); return new FileInputStream(getAvatarFile(realm, user));
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
logger.debugf("Avatar file not found for user '%s' in realm '%s'", user.getUsername(), realm.getName()); logger.debugf("Avatar file not found for user '%s' in realm '%s'", user.getUsername(), realm.getName());
return null; return null;
@ -91,12 +86,12 @@ public class FileAvatarStorageProvider implements AvatarStorageProvider {
checkRealmFolderExistence(realm.getName()); checkRealmFolderExistence(realm.getName());
File avatarFile = getAvatarFile(realm, user); File avatarFile = getAvatarFile(realm, user);
if (avatarFile.exists()) { if (avatarFile.exists()) {
logger.debugf("Deleting avatar file for user %s, file path is: %s", user.getUsername(), logger.debugf("Deleting avatar file for user '%s' in realm '%s', file path is: %s", user.getUsername(),
avatarFile.getAbsolutePath()); realm.getName(), avatarFile.getAbsolutePath());
avatarFile.delete(); avatarFile.delete();
} else { } else {
logger.debugf("Avatar file to delete not found for user %s", user.getUsername()); logger.debugf("Avatar file to delete not found for user '%s' in realm '%s'", user.getUsername(), realm.getName());
} }
} }