Deprectated access key migration stuff and tests

MyCoRe-Org · Oct 24, 2024 · 5a6b98c · 5a6b98c
1 parent b2481d5
commit 5a6b98c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/mir-module/src/main/java/org/mycore/mir/migration/MIRMigration202106Utils.java b/mir-module/src/main/java/org/mycore/mir/migration/MIRMigration202106Utils.java
@@ -76,6 +76,7 @@ public static void migrateAccessKeyPairs() throws MCRException {
         migrateAccessKeys();
     }
 
+    @Deprecated
     @MCRCommand(syntax = "migrate all access keys",
         help = "Migrates all MIR access key to MCR access keys."
             + " Should be used to migrate from version 2021.05.")
@@ -99,6 +100,7 @@ public static void migrateAccessKeys() throws MCRException {
         LOGGER.info("migrated all keys to MCR access keys");
     }
 
+    @Deprecated
     @MCRCommand(syntax = "migrate all access key user attributes",
         help = "Hashes all access key user attributes."
             + " Is only necessary if the secrets are hashed."
@@ -111,20 +113,19 @@ public static void migrateAccessKeyUserAttributes() {
             users = listUsersWithMIRAccessKeyUserAttribute(offset, limit);
             for (final MCRUser user : users) {
                 final List<MCRUserAttribute> attributes = user.getAttributes()
-                        .stream()
-                        .filter(attribute -> attribute.getName().startsWith(ACCESS_KEY_PREFIX))
-                        .collect(Collectors.toList());
+                    .stream()
+                    .filter(attribute -> attribute.getName().startsWith(ACCESS_KEY_PREFIX))
+                    .collect(Collectors.toList());
                 for (MCRUserAttribute attribute : attributes) {
                     final String attributeName = attribute.getName();
                     final MCRObjectID objectId = MCRObjectID.getInstance(attributeName.substring(
-                            attributeName.indexOf("_") + 1));
+                        attributeName.indexOf("_") + 1));
                     attribute.setName(MCRAccessKeyUtils.ACCESS_KEY_PREFIX + objectId.toString());
                     attribute.setValue(MCRAccessKeyManager.hashSecret(attribute.getValue(), objectId));
                 }
             }
             offset += limit;
-        }
-        while (users.size() == limit);
+        } while (users.size() == limit);
     }
 
     /**
@@ -216,7 +217,7 @@ private static synchronized void createAccessKey(final MCRObjectID objectId, fin
         }
     }
 
-   /**
+    /**
      * Removes {@link MIRAccessKey}
      *
      * @param accessKey the {@link MIRAccessKey}

diff --git a/...module/src/test/java/org/mycore/mir/authorization/accesskeys/MIRAccessKeyManagerTest.java b/...module/src/test/java/org/mycore/mir/authorization/accesskeys/MIRAccessKeyManagerTest.java
@@ -38,6 +38,7 @@
 import org.mycore.mcr.acl.accesskey.model.MCRAccessKey;
 import org.mycore.mir.authorization.accesskeys.backend.MIRAccessKeyPair;
 
+@Deprecated
 public class MIRAccessKeyManagerTest extends MCRJPATestCase {
 
     private static final String OBJECT_ID = "mcr_test_00000001";
@@ -103,7 +104,6 @@ public void testCreateSameKeyPair() {
         MIRAccessKeyManager.createKeyPair(sameAccKP);
     }
 
-
     @Test
     public void testGetKeyPair() {
         final MCRAccessKey accessKeyRead = new MCRAccessKey(READ_KEY, PERMISSION_READ);

diff --git a/mir-module/src/test/java/org/mycore/mir/migration/MIRMigration202106UtilsTest.java b/mir-module/src/test/java/org/mycore/mir/migration/MIRMigration202106UtilsTest.java
@@ -58,14 +58,15 @@ public void setUp() throws Exception {
         super.setUp();
         objectId = MCRObjectID.getInstance(OBJECT_ID);
     }
- 
+
     @Override
     protected Map<String, String> getTestProperties() {
         Map<String, String> testProperties = super.getTestProperties();
         testProperties.put("MCR.Metadata.Type.test", Boolean.TRUE.toString());
         return testProperties;
     }
 
+    @Deprecated
     @Test
     public void testMigrationAccessKeyPair() throws Exception {
         final MIRAccessKeyPair accessKeyPair = new MIRAccessKeyPair(objectId, READ_KEY, WRITE_KEY);
@@ -83,6 +84,7 @@ public void testMigrationAccessKeyPair() throws Exception {
         assertEquals(PERMISSION_WRITE, accessKeyWrite.getType());
     }
 
+    @Deprecated
     @Test
     public void testMigrateMIRAccessKey() throws Exception {
         final MIRAccessKey mirAccessKey = new MIRAccessKey(READ_KEY, PERMISSION_READ);
@@ -103,6 +105,7 @@ public void testMigrateMIRAccessKey() throws Exception {
         assertTrue(accessKey.getIsActive());
     }
 
+    @Deprecated
     @Test
     public void testUserAttributeMigration() throws Exception {
         final MCRUser user1 = new MCRUser("junit");