Merge branch '2024.06.x'

* 2024.06.x:
  Fix merge error
  fix bibutils download
  MIR-1412 move the message "show MD5 sums/hide MD5 sums" to the area for all users, even unregistered ones (#1148)
  MIR-1440 adopt recent changes to PMD configuration (#1137)
  MIR-1442-fix VIAF autosuggest request
  MCR-3348 rename static factory methods as per new convention and deprecate old methods (#1123)

Author: sebhofmann

.github/workflows/ci.yml

@@ -45,7 +45,7 @@ jobs:
       if: steps.bibutils-cache.outputs.cache-hit != 'true'
       run: |
         mkdir ~/bibutils
-        curl -L https://kumisystems.dl.sourceforge.net/project/bibutils/bibutils_${BIBUTILS_VERSION}_src.tgz | \
+        curl -L https://downloads.sourceforge.net/project/bibutils/bibutils_${BIBUTILS_VERSION}_src.tgz | \
           tar -C ~/bibutils --strip-components=1 -xzvf-
         cd ~/bibutils
         ./configure

mir-module/src/main/java/org/mycore/mir/MIRGetOpenAIREProjectsServlet.java

@@ -24,7 +24,7 @@ public class MIRGetOpenAIREProjectsServlet extends HttpServlet {
     @Serial
     private static final long serialVersionUID = 1L;
 
-    private static Logger LOGGER = LogManager.getLogger();
+    private static final Logger LOGGER = LogManager.getLogger();
 
     private HttpClient client;
 

mir-module/src/main/java/org/mycore/mir/authorization/accesskeys/MIRAccessKeyEventHandler.java

@@ -39,7 +39,7 @@
 @Deprecated
 public class MIRAccessKeyEventHandler extends MCREventHandlerBase {
 
-    private static Logger LOGGER = LogManager.getLogger();
+    private static final Logger LOGGER = LogManager.getLogger();
 
     /* (non-Javadoc)
      * @see org.mycore.common.events.MCREventHandlerBase#handleObjectCreated(org.mycore.common.events.MCREvent, org.mycore.datamodel.metadata.MCRObject)

mir-module/src/main/java/org/mycore/mir/authorization/accesskeys/backend/MIRAccessKeyPair.java

@@ -105,7 +105,15 @@ public MIRAccessKeyPair(final MCRObjectID mcrObjectId, final String readKey, fin
         setWriteKey(writeKey);
     }
 
+    /**
+     * @deprecated Use {@link #ofServiceFlags(MCRObjectID, ServiceFlags)} instead
+     */
+    @Deprecated
     public static MIRAccessKeyPair fromServiceFlags(final MCRObjectID mcrObjectId, final ServiceFlags servFlags) {
+        return ofServiceFlags(mcrObjectId, servFlags);
+    }
+
+    public static MIRAccessKeyPair ofServiceFlags(final MCRObjectID mcrObjectId, final ServiceFlags servFlags) {
         final MIRAccessKeyPair accKP = new MIRAccessKeyPair();
         accKP.setMCRObjectId(mcrObjectId);
 

mir-module/src/main/java/org/mycore/mir/common/MIRCoreVersion.java

@@ -36,6 +36,7 @@
  * @author Thomas Scheffler (yagee)
  *
  */
+@SuppressWarnings("PMD.MCR.ResourceResolver")
 public class MIRCoreVersion {
     private static Properties prop = loadVersionProperties();
 

mir-module/src/main/java/org/mycore/mir/migration/MIRMigration03Utils.java

@@ -20,6 +20,7 @@
  */
 @MCRCommandGroup(
     name = "MIR migration 0.3")
+@SuppressWarnings("PMD.MCR.ResourceResolver")
 public class MIRMigration03Utils {
 
     private static final Logger LOGGER = LogManager.getLogger();

mir-module/src/main/java/org/mycore/mir/migration/MIRMigration04Utils.java

@@ -16,6 +16,7 @@
  */
 @MCRCommandGroup(
     name = "MIR migration 0.4")
+@SuppressWarnings("PMD.MCR.ResourceResolver")
 public class MIRMigration04Utils {
 
     private static final Logger LOGGER = LogManager.getLogger();

mir-module/src/main/java/org/mycore/mir/migration/MIRMigration201603Utils.java

@@ -19,6 +19,7 @@
  */
 @MCRCommandGroup(
     name = "MIR migration 2016.03")
+@SuppressWarnings("PMD.MCR.ResourceResolver")
 public class MIRMigration201603Utils {
 
     private static final Logger LOGGER = LogManager.getLogger();

mir-module/src/main/java/org/mycore/mir/migration/MIRMigration201706Utils.java

@@ -23,6 +23,7 @@
 
 @MCRCommandGroup(
     name = "MIR migration 2017.06")
+@SuppressWarnings("PMD.MCR.ResourceResolver")
 public class MIRMigration201706Utils {
 
     private static final Logger LOGGER = LogManager.getLogger();

mir-module/src/main/java/org/mycore/mir/migration/MIRMigration202006Utils.java

@@ -49,9 +49,10 @@
 
 @MCRCommandGroup(
     name = "MIR migration 2020.06")
+@SuppressWarnings("PMD.MCR.ResourceResolver")
 public class MIRMigration202006Utils {
 
-    public static final Logger LOGGER = LogManager.getLogger();
+    private static final Logger LOGGER = LogManager.getLogger();
 
     private static final MCRCategoryID CONTENT_TYPE_ID = MCRCategoryID.ofString("derivate_types:content");