MCR-3581 Use improved access key factory methods

Author: golsch

mir-module/src/main/java/org/mycore/mir/authorization/MIRAccessKeyStrategy.java

@@ -9,7 +9,8 @@
 import org.mycore.datamodel.metadata.MCRObjectID;
 import org.mycore.mcr.acl.accesskey.config.MCRAccessKeyConfig;
 import org.mycore.mcr.acl.accesskey.dto.MCRAccessKeyDto;
-import org.mycore.mcr.acl.accesskey.service.MCRAccessKeyServiceFactory;
+import org.mycore.mcr.acl.accesskey.service.MCRAccessKeySessionService;
+import org.mycore.mcr.acl.accesskey.service.MCRAccessKeyUserService;
 
 /**
  * Strategy class for checking access permissions on objects based on access keys.
@@ -62,8 +63,7 @@ private static String sanitizePermission(String permission) {
     }
 
     private boolean checkSessionHasValidAccessKey(String objectId, String permission) {
-        final MCRAccessKeyDto accessKey
-            = MCRAccessKeyServiceFactory.getAccessKeySessionService().findActiveAccessKey(objectId);
+        final MCRAccessKeyDto accessKey = MCRAccessKeySessionService.obtainInstance().findActiveAccessKey(objectId);
         if (accessKey != null) {
             LOGGER.debug("Found match in access key strategy for {} on {} in session.", permission,
                 objectId);
@@ -73,8 +73,7 @@ private boolean checkSessionHasValidAccessKey(String objectId, String permission
     }
 
     private boolean checkUserHasValidAccessKey(String objectId, String permission) {
-        final MCRAccessKeyDto accessKey
-            = MCRAccessKeyServiceFactory.getAccessKeyUserService().findActiveAccessKey(objectId);
+        final MCRAccessKeyDto accessKey = MCRAccessKeyUserService.obtainInstance().findActiveAccessKey(objectId);
         if (accessKey != null) {
             LOGGER.debug("Found match in access key strategy for {} on {} in user attributes.", permission,
                 objectId);

mir-module/src/main/java/org/mycore/mir/authorization/accesskeys/frontend/servlet/MIRAccessKeyServlet.java

@@ -31,7 +31,8 @@
 import org.mycore.frontend.servlets.MCRServletJob;
 import org.mycore.mcr.acl.accesskey.config.MCRAccessKeyConfig;
 import org.mycore.mcr.acl.accesskey.exception.MCRAccessKeyException;
-import org.mycore.mcr.acl.accesskey.service.MCRAccessKeyServiceFactory;
+import org.mycore.mcr.acl.accesskey.service.MCRAccessKeySessionService;
+import org.mycore.mcr.acl.accesskey.service.MCRAccessKeyUserService;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -77,9 +78,9 @@ protected void doGetPost(MCRServletJob job) throws Exception {
         }
         try {
             if (isGuest) {
-                MCRAccessKeyServiceFactory.getAccessKeySessionService().activateAccessKey(objId, value);
+                MCRAccessKeySessionService.obtainInstance().activateAccessKey(objId, value);
             } else {
-                MCRAccessKeyServiceFactory.getAccessKeyUserService().activateAccessKey(objId, value);
+                MCRAccessKeyUserService.obtainInstance().activateAccessKey(objId, value);
             }
         } catch (MCRAccessKeyException e) {
             res.sendError(HttpServletResponse.SC_BAD_REQUEST, "Access key is unknown or not allowed.");

mir-module/src/test/java/org/mycore/mir/authorization/MIRStrategyTest.java

@@ -36,7 +36,8 @@
 import org.mycore.frontend.cli.MCRCommandLineInterface;
 import org.mycore.frontend.cli.MCRCommandManager;
 import org.mycore.mcr.acl.accesskey.dto.MCRAccessKeyDto;
-import org.mycore.mcr.acl.accesskey.service.MCRAccessKeyServiceFactory;
+import org.mycore.mcr.acl.accesskey.service.MCRAccessKeyService;
+import org.mycore.mcr.acl.accesskey.service.MCRAccessKeyUserService;
 import org.mycore.resource.MCRResourceHelper;
 import org.mycore.test.MCRJPAExtension;
 import org.mycore.test.MyCoReTest;
@@ -167,13 +168,13 @@ public void checkAccessKeyPermission() throws Exception {
         accessKeyRead.setSecret("mySecret");
         accessKeyRead.setPermission(MCRAccessManager.PERMISSION_READ);
         accessKeyRead.setReference(mir_mods_00004711.toString());
-        MCRAccessKeyServiceFactory.getAccessKeyService().addAccessKey(accessKeyRead);
+        MCRAccessKeyService.obtainInstance().addAccessKey(accessKeyRead);
 
         final MCRAccessKeyDto accessKeyWrite = new MCRAccessKeyDto();
         accessKeyWrite.setSecret("letMeIn");
         accessKeyWrite.setPermission(MCRAccessManager.PERMISSION_WRITE);
         accessKeyWrite.setReference(mir_mods_00004711.toString());
-        MCRAccessKeyServiceFactory.getAccessKeyService().addAccessKey(accessKeyWrite);
+        MCRAccessKeyService.obtainInstance().addAccessKey(accessKeyWrite);
 
         final MCRCategLinkService categLinkService = MCRCategLinkServiceFactory.obtainInstance();
         MCRCategLinkReference ref = new MCRCategLinkReference(mir_mods_00004711);
@@ -183,8 +184,7 @@ public void checkAccessKeyPermission() throws Exception {
         assertFalse(strategy.checkPermission(mir_derivate_00004711.toString(), MCRAccessManager.PERMISSION_READ));
 
         //Give user read access-token
-        MCRAccessKeyServiceFactory.getAccessKeyUserService()
-            .activateAccessKey(mir_mods_00004711.toString(), "mySecret");
+        MCRAccessKeyUserService.obtainInstance().activateAccessKey(mir_mods_00004711.toString(), "mySecret");
         junitUser = MCRUserManager.getUser(junitUser.getUserName());
         MCRSessionMgr.getCurrentSession().setUserInformation(junitUser);
 
@@ -196,8 +196,7 @@ public void checkAccessKeyPermission() throws Exception {
         assertTrue(strategy.checkPermission(mir_mods_00004711.toString(), MCRAccessManager.PERMISSION_PREVIEW));
 
         //Give user write access-token
-        MCRAccessKeyServiceFactory.getAccessKeyUserService().activateAccessKey(
-            mir_mods_00004711.toString(), "letMeIn");
+        MCRAccessKeyUserService.obtainInstance().activateAccessKey(mir_mods_00004711.toString(), "letMeIn");
         junitUser = MCRUserManager.getUser(junitUser.getUserName());
         MCRSessionMgr.getCurrentSession().setUserInformation(junitUser);