Merge remote-tracking branch 'origin/dev-1.2' into development

Author: anhefti

src/main/java/ch/ethz/seb/sps/server/servicelayer/impl/ProctoringCacheService.java

@@ -10,9 +10,10 @@
 
 import java.util.Collection;
 
-import ch.ethz.seb.sps.domain.model.service.ScreenshotData;
+import ch.ethz.seb.sps.domain.model.user.ServerUser;
 import ch.ethz.seb.sps.server.datalayer.batis.model.ScreenshotDataRecord;
 import ch.ethz.seb.sps.server.datalayer.dao.ScreenshotDataDAO;
+import ch.ethz.seb.sps.server.datalayer.dao.UserDAO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cache.annotation.CacheEvict;
@@ -47,18 +48,23 @@ public class ProctoringCacheService {
     /** Total session count cache. */
     public static final String TOTAL_SESSION_COUNT = "TOTAL_SESSION_COUNT_CACHE";
 
+    public static final String SERVER_USER_CACHE = "SERVER_USER_CACHE";
+
     private final ScreenshotDataDAO screenshotDataDAO;
     private final SessionDAO sessionDAO;
     private final GroupDAO groupDAO;
+    private final UserDAO userDAO;
 
     public ProctoringCacheService(
-            final ScreenshotDataDAO screenshotDataDAO, 
+            final ScreenshotDataDAO screenshotDataDAO,
             final SessionDAO sessionDAO,
-            final GroupDAO groupDAO) {
+            final GroupDAO groupDAO,
+            final UserDAO userDAO) {
 
         this.screenshotDataDAO = screenshotDataDAO;
         this.sessionDAO = sessionDAO;
         this.groupDAO = groupDAO;
+        this.userDAO = userDAO;
     }
 
     @Cacheable(
@@ -180,4 +186,23 @@ public void evictSessionScreenshotData(final String sessionUUID) {
         }
     }
 
+    @Cacheable(
+            cacheNames = SERVER_USER_CACHE,
+            key = "#name",
+            unless = "#result == null")
+    public ServerUser serverUserByName(String name) {
+        return userDAO.byUsername(name)
+                .onError(error -> log.error("Failed to get ServerUser by name: {} cause: {}", name, error.getMessage()))
+                .getOr(null);
+    }
+
+    @CacheEvict(
+            cacheNames = SERVER_USER_CACHE,
+            key = "#name")
+    public void evictServerUserByName(String name) {
+        if (log.isTraceEnabled()) {
+            log.trace("Eviction of ServerUser from cache, name: {}", name);
+        }
+    }
+
 }

src/main/java/ch/ethz/seb/sps/server/servicelayer/impl/UserServiceImpl.java

@@ -378,18 +378,15 @@ public interface ExtractUserFromAuthenticationStrategy {
     @Component
     public static class DefaultUserExtractStrategy implements ExtractUserFromAuthenticationStrategy {
 
-        final UserDAO userDAO;
+        final ProctoringCacheService cacheService;
 
-        DefaultUserExtractStrategy(UserDAO userDAO) {
-            this.userDAO = userDAO;
+        DefaultUserExtractStrategy(final ProctoringCacheService cacheService) {
+            this.cacheService = cacheService;
         }
 
         @Override
         public ServerUser extract(final Principal principal) {
-            String name = principal.getName();
-            return userDAO.byUsername(name)
-                    .onError(error -> log.warn("Failed to find user for token authentication: {}", name))
-                    .getOr(null);
+            return cacheService.serverUserByName(principal.getName());
         }
     }
 

src/main/resources/config/ehcache.xml

@@ -60,6 +60,15 @@
         </resources>
     </cache>
 
-    
+    <cache alias="SERVER_USER_CACHE">
+        <key-type>java.lang.String</key-type>
+        <value-type>ch.ethz.seb.sps.domain.model.user.ServerUser</value-type>
+        <expiry>
+            <ttl unit="minutes">10</ttl>
+        </expiry>
+        <resources>
+            <heap unit="entries">100</heap>
+        </resources>
+    </cache>
 
 </config>