From 157e5f46aa3467001371a74e9805deb5a9e14429 Mon Sep 17 00:00:00 2001
From: Mauro Mugnaini <mauro.mugnaini@nubisware.com>
Date: Mon, 9 Oct 2023 17:14:41 +0200
Subject: [PATCH] Minor optimizations and more talking logs messages

---
 .../file/FileAvatarStorageProvider.java       | 25 ++++++++-----------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/avatar-realm-resource/src/main/java/org/gcube/keycloak/avatar/storage/file/FileAvatarStorageProvider.java b/avatar-realm-resource/src/main/java/org/gcube/keycloak/avatar/storage/file/FileAvatarStorageProvider.java
index 3f30bad..05458fc 100644
--- a/avatar-realm-resource/src/main/java/org/gcube/keycloak/avatar/storage/file/FileAvatarStorageProvider.java
+++ b/avatar-realm-resource/src/main/java/org/gcube/keycloak/avatar/storage/file/FileAvatarStorageProvider.java
@@ -38,15 +38,17 @@ public class FileAvatarStorageProvider implements AvatarStorageProvider {
     public void saveAvatarImage(RealmModel realm, UserModel user, InputStream input) {
         checkRealmFolderExistence(realm.getName());
         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()) {
+            logger.debugf("Saving new avatar file for user %s, file path is: %s", user.getUsername(),
+                    avatarFile.getAbsolutePath());
             try {
                 avatarFile.createNewFile();
             } catch (IOException 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)) {
             IOUtils.copy(input, fos);
@@ -58,7 +60,7 @@ public class FileAvatarStorageProvider implements AvatarStorageProvider {
     private void checkRealmFolderExistence(String realmName) {
         File realmFile = new File(avatarFolder, realmName);
         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();
         }
     }
@@ -66,15 +68,8 @@ public class FileAvatarStorageProvider implements AvatarStorageProvider {
     @Override
     public InputStream loadAvatarImage(RealmModel realm, UserModel user) {
         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 {
-            return new FileInputStream(avatarFile);
+            return new FileInputStream(getAvatarFile(realm, user));
         } catch (FileNotFoundException e) {
             logger.debugf("Avatar file not found for user '%s' in realm '%s'", user.getUsername(), realm.getName());
             return null;
@@ -91,12 +86,12 @@ public class FileAvatarStorageProvider implements AvatarStorageProvider {
         checkRealmFolderExistence(realm.getName());
         File avatarFile = getAvatarFile(realm, user);
         if (avatarFile.exists()) {
-            logger.debugf("Deleting avatar file for user %s, file path is: %s", user.getUsername(),
-                    avatarFile.getAbsolutePath());
+            logger.debugf("Deleting avatar file for user  '%s' in realm '%s', file path is: %s", user.getUsername(),
+                    realm.getName(), avatarFile.getAbsolutePath());
 
             avatarFile.delete();
         } 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());
         }
     }