From 935a003aa523eb93b40f1b413f8df1a1472510eb Mon Sep 17 00:00:00 2001
From: Stefan Weil <sw@weilnetz.de>
Date: Thu, 18 Jul 2024 17:34:00 +0200
Subject: [PATCH 1/2] Fix coding style issues

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 .../forms/createprocess/ProcessFieldedMetadata.java           | 2 --
 .../interfaces/activemq/MapMessageObjectReader.java           | 4 ++--
 .../java/org/kitodo/production/services/data/TaskService.java | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessFieldedMetadata.java b/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessFieldedMetadata.java
index a427cde1025..0dabe513dc3 100644
--- a/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessFieldedMetadata.java
+++ b/Kitodo/src/main/java/org/kitodo/production/forms/createprocess/ProcessFieldedMetadata.java
@@ -444,8 +444,6 @@ private Collection<MetadataEntry> simpleValues(Collection<Metadata> values) {
      * Returns the only metadata entry or null. Throws an IllegalStateException
      * if the value is ambiguous or cannot be cast.
      *
-     * @param <T>
-     *
      * @param values
      *            values obtained
      * @return the only entry or null
diff --git a/Kitodo/src/main/java/org/kitodo/production/interfaces/activemq/MapMessageObjectReader.java b/Kitodo/src/main/java/org/kitodo/production/interfaces/activemq/MapMessageObjectReader.java
index 21837bc7956..59dfb115d15 100644
--- a/Kitodo/src/main/java/org/kitodo/production/interfaces/activemq/MapMessageObjectReader.java
+++ b/Kitodo/src/main/java/org/kitodo/production/interfaces/activemq/MapMessageObjectReader.java
@@ -160,8 +160,6 @@ public Integer getMandatoryInteger(String key) throws JMSException {
      *             type String.
      */
     public Map<String, String> getMapOfStringToString(String key) {
-        Map<String, String> mapOfStringToString = new HashMap<>();
-
         Object mapObject = null;
         try {
             mapObject = ticket.getObject(key);
@@ -176,6 +174,8 @@ public Map<String, String> getMapOfStringToString(String key) {
             throw new IllegalArgumentException(
                     "Incompatible types: \"" + key + WRONG_TYPE + "Map<?, ?>.");
         }
+
+        Map<String, String> mapOfStringToString = new HashMap<>();
         for (Object keyObject : ((Map<?, ?>) mapObject).keySet()) {
             Object valueObject = ((Map<?, ?>) mapObject).get(keyObject);
             if (!(keyObject instanceof String)) {
diff --git a/Kitodo/src/main/java/org/kitodo/production/services/data/TaskService.java b/Kitodo/src/main/java/org/kitodo/production/services/data/TaskService.java
index 753b277cdbf..e8a30a2c1e5 100644
--- a/Kitodo/src/main/java/org/kitodo/production/services/data/TaskService.java
+++ b/Kitodo/src/main/java/org/kitodo/production/services/data/TaskService.java
@@ -120,8 +120,6 @@ public static TaskService getInstance() {
      */
     private BoolQueryBuilder createUserTaskQuery(String filter, boolean onlyOwnTasks, boolean hideCorrectionTasks,
                                                  boolean showAutomaticTasks, List<TaskStatus> taskStatusRestrictions) {
-        User user = ServiceManager.getUserService().getAuthenticatedUser();
-
         BoolQueryBuilder query = new BoolQueryBuilder();
         query.must(getQueryForTemplate(0));
         if (Objects.isNull(filter)) {
@@ -133,6 +131,8 @@ private BoolQueryBuilder createUserTaskQuery(String filter, boolean onlyOwnTasks
         query.must(getQueryForProcessingStatuses(taskStatusRestrictions.stream()
                 .map(TaskStatus::getValue).collect(Collectors.toSet())));
 
+        User user = ServiceManager.getUserService().getAuthenticatedUser();
+
         if (onlyOwnTasks) {
             query.must(getQueryForProcessingUser(user.getId()));
         } else {

From 3242737aa259eeb9b603324cd9f594eb97a17497 Mon Sep 17 00:00:00 2001
From: Stefan Weil <sw@weilnetz.de>
Date: Thu, 18 Jul 2024 16:47:31 +0200
Subject: [PATCH 2/2] Update maven-checkstyle-plugin and its dependencies

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7d604ec24e9..f8571a9babd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,7 @@
         <checkstyle.config.location>config/checkstyle.xml</checkstyle.config.location>
         <main.basedir>${project.basedir}</main.basedir>
         <phase.prop>none</phase.prop>
+        <!-- https://maven.apache.org/plugins/maven-checkstyle-plugin/check-mojo.html -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.source>11</maven.compiler.source>
@@ -891,12 +892,12 @@ from system library in Java 11+ -->
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-checkstyle-plugin</artifactId>
-                        <version>3.1.2</version>
+                        <version>3.4.0</version>
                         <dependencies>
                             <dependency>
                                 <groupId>com.puppycrawl.tools</groupId>
                                 <artifactId>checkstyle</artifactId>
-                                <version>10.3.2</version>
+                                <version>10.17.0</version>
                             </dependency>
                         </dependencies>
                         <executions>
@@ -904,7 +905,6 @@ from system library in Java 11+ -->
                                 <id>checkstyle-check</id>
                                 <phase>validate</phase>
                                 <configuration>
-                                    <encoding>UTF-8</encoding>
                                     <failOnViolation>true</failOnViolation>
                                     <failsOnError>false</failsOnError>
                                     <logViolationsToConsole>true</logViolationsToConsole>