Refactored logging.

dataquest-dev · Nov 30, 2023 · 81e950a · 81e950a
1 parent 5f14d06
commit 81e950a
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/dspace-api/src/main/java/org/dspace/app/statistics/clarin/ClarinMatomoBitstreamTracker.java b/dspace-api/src/main/java/org/dspace/app/statistics/clarin/ClarinMatomoBitstreamTracker.java
@@ -8,6 +8,7 @@
 package org.dspace.app.statistics.clarin;
 
 import java.sql.SQLException;
+import java.text.MessageFormat;
 import java.util.List;
 import java.util.Objects;
 import javax.servlet.http.HttpServletRequest;
@@ -146,13 +147,11 @@ public void trackBitstreamDownload(Context context, HttpServletRequest request,
      */
     private void logUserDownloadingBitstream(Context context, Bitstream bit) {
         EPerson eperson = context.getCurrentUser();
-        if (Objects.isNull(eperson)) {
-            log.info("ANONYMOUS user is trying to download bitstream " + bit.getName() + " with ID: " +
-                    bit.getID());
-            return;
-        }
+        String pattern = "The user name: {0}, uuid: {1} is downloading bitstream name: {2}, uuid: {3}.";
+        String logMessage = Objects.isNull(eperson)
+                ? MessageFormat.format(pattern, "ANONYMOUS", "null", bit.getName(), bit.getID())
+                : MessageFormat.format(pattern, eperson.getFullName(), eperson.getID(), bit.getName(), bit.getID());
 
-        log.info("User: " + eperson.getFullName() + " with ID: " + eperson.getID() + " is downloading" +
-                " bitstream " + bit.getName() + " with ID: " + bit.getID());
+        log.info(logMessage);
     }
 }