upgrade to java 22

Author: Taz03

.github/workflows/basic-checks.yml

@@ -3,7 +3,7 @@ name: Basic checks
 on: [pull_request]
 
 env:
-  JAVA_VERSION: 21
+  JAVA_VERSION: 22
 
 jobs:
   spotless:

.github/workflows/code-analysis.yml

@@ -8,7 +8,7 @@ on:
     - cron: '0 20 * * 4'
 
 env:
-  JAVA_VERSION: 21
+  JAVA_VERSION: 22
 
 jobs:
   sonar:

.github/workflows/docker-publish.yaml

@@ -7,7 +7,7 @@ on:
       - 'master'
 
 env:
-  JAVA_VERSION: 21
+  JAVA_VERSION: 22
 
 jobs:
   docker:

.github/workflows/docker-verify.yaml

@@ -3,7 +3,7 @@ name: Docker Verify
 on: [pull_request]
 
 env:
-  JAVA_VERSION: 21
+  JAVA_VERSION: 22
 
 jobs:
   docker:

.github/workflows/releases.yaml

@@ -10,7 +10,7 @@ defaults:
     shell: bash
 
 env:
-  JAVA_VERSION: 21
+  JAVA_VERSION: 22
 
 jobs:
 

README.md

@@ -1,7 +1,7 @@
 # TJ-Bot
 
 [![codefactor](https://img.shields.io/codefactor/grade/github/together-java/tj-bot)](https://www.codefactor.io/repository/github/together-java/tj-bot)
-![Java](https://img.shields.io/badge/Java-21-ff696c)
+![Java](https://img.shields.io/badge/Java-22-ff696c)
 [![license](https://img.shields.io/github/license/Together-Java/TJ-Bot)](https://github.com/Together-Java/TJ-Bot/blob/master/LICENSE)
 ![GitHub release (latest by date)](https://img.shields.io/github/v/release/Together-Java/TJ-Bot?label=release)
 

application/src/main/java/org/togetherjava/tjbot/features/code/CodeMessageHandler.java

@@ -224,7 +224,7 @@ public void onMessageUpdated(MessageUpdateEvent event) {
 
             // Re-apply the current action
             return codeReplyMessage.editMessageEmbeds(maybeCodeAction.orElseThrow().apply(code));
-        }).queue(any -> {
+        }).queue(_ -> {
         }, failure -> logger.warn(
                 "Attempted to update a code-reply-message ({}), but failed. The original code-message was {}",
                 codeReplyMessageId, originalMessageId, failure));
@@ -253,7 +253,7 @@ public void onMessageDeleted(MessageDeleteEvent event) {
         // Delete the code reply as well
         originalMessageToCodeReply.invalidate(originalMessageId);
 
-        event.getChannel().deleteMessageById(codeReplyMessageId).queue(any -> {
+        event.getChannel().deleteMessageById(codeReplyMessageId).queue(_ -> {
         }, failure -> logger.warn(
                 "Attempted to delete a code-reply-message ({}), but failed. The original code-message was {}",
                 codeReplyMessageId, originalMessageId, failure));

application/src/main/java/org/togetherjava/tjbot/features/help/GuildLeaveCloseThreadListener.java

@@ -36,7 +36,7 @@ public void onGuildMemberRemove(GuildMemberRemoveEvent event) {
                 .filter(thread -> thread.getOwnerIdLong() == event.getUser().getIdLong())
                 .filter(thread -> thread.getParentChannel().getName().matches(helpForumPattern))
                 .forEach(thread -> thread.sendMessageEmbeds(embed)
-                    .flatMap(any -> thread.getManager().setArchived(true))
+                    .flatMap(_ -> thread.getManager().setArchived(true))
                     .queue()));
     }
 }

application/src/main/java/org/togetherjava/tjbot/features/help/HelpSystemHelper.java

@@ -165,7 +165,7 @@ RestAction<Message> constructChatGptAttempt(ThreadChannel threadChannel,
         }
 
         MessageEmbed responseEmbed = generateGptResponseEmbed(answer, selfUser, originalQuestion);
-        return message.flatMap(any -> threadChannel.sendMessageEmbeds(responseEmbed)
+        return message.flatMap(_ -> threadChannel.sendMessageEmbeds(responseEmbed)
             .addActionRow(
                     generateDismissButton(componentIdInteractor, idForDismissButton.toString())));
     }

application/src/main/java/org/togetherjava/tjbot/features/help/HelpThreadAutoArchiver.java

@@ -151,7 +151,7 @@ private void triggerArchiveFlow(ThreadChannel threadChannel, long authorId,
 
                 return sendEmbedWithMention.apply(authorResults.get());
             })
-            .flatMap(any -> threadChannel.getManager().setArchived(true))
+            .flatMap(_ -> threadChannel.getManager().setArchived(true))
             .queue();
     }
 

application/src/main/java/org/togetherjava/tjbot/features/help/HelpThreadCommand.java

@@ -102,7 +102,7 @@ public HelpThreadCommand(Config config, HelpSystemHelper helper) {
             .collect(Collectors.toMap(Subcommand::getCommandName, Function.identity()));
         subcommandToCooldownCache = new EnumMap<>(streamSubcommands()
             .filter(Subcommand::hasCooldown)
-            .collect(Collectors.toMap(Function.identity(), any -> createCooldownCache.get())));
+            .collect(Collectors.toMap(Function.identity(), _ -> createCooldownCache.get())));
         subcommandToEventHandler = new EnumMap<>(Map.of(Subcommand.CHANGE_CATEGORY,
                 this::changeCategory, Subcommand.CHANGE_TITLE, this::changeTitle, Subcommand.CLOSE,
                 this::closeThread, Subcommand.RESET_ACTIVITY, this::resetActivity));
@@ -158,7 +158,7 @@ private void changeCategory(SlashCommandInteractionEvent event, ThreadChannel he
         refreshCooldownFor(Subcommand.CHANGE_CATEGORY, helpThread);
 
         helper.changeChannelCategory(helpThread, category)
-            .flatMap(any -> sendCategoryChangedMessage(helpThread.getGuild(), event.getHook(),
+            .flatMap(_ -> sendCategoryChangedMessage(helpThread.getGuild(), event.getHook(),
                     helpThread, category))
             .queue();
     }
@@ -185,7 +185,7 @@ private RestAction<Message> sendCategoryChangedMessage(Guild guild, InteractionH
         String headsUpPattern = "%s please have a look, thanks.";
         String headsUpWithoutRole = headsUpPattern.formatted("");
         String headsUpWithRole = headsUpPattern.formatted(helperRole.orElseThrow().getAsMention());
-        return action.flatMap(any -> helpThread.sendMessage(headsUpWithoutRole)
+        return action.flatMap(_ -> helpThread.sendMessage(headsUpWithoutRole)
             .flatMap(message -> message.editMessage(headsUpWithRole)));
     }
 
@@ -195,7 +195,7 @@ private void changeTitle(SlashCommandInteractionEvent event, ThreadChannel helpT
         refreshCooldownFor(Subcommand.CHANGE_TITLE, helpThread);
 
         helper.renameChannel(helpThread, title)
-            .flatMap(any -> event.reply("Changed the title to **%s**.".formatted(title)))
+            .flatMap(_ -> event.reply("Changed the title to **%s**.".formatted(title)))
             .queue();
     }
 
@@ -206,7 +206,7 @@ private void closeThread(SlashCommandInteractionEvent event, ThreadChannel helpT
             .setColor(HelpSystemHelper.AMBIENT_COLOR)
             .build();
 
-        event.replyEmbeds(embed).flatMap(any -> helpThread.getManager().setArchived(true)).queue();
+        event.replyEmbeds(embed).flatMap(_ -> helpThread.getManager().setArchived(true)).queue();
     }
 
     private void resetActivity(SlashCommandInteractionEvent event, ThreadChannel helpThread) {

application/src/main/java/org/togetherjava/tjbot/features/help/HelpThreadCreatedListener.java

@@ -76,7 +76,7 @@ private boolean wasThreadAlreadyHandled(long threadChannelId) {
         // the threads we already handled
         Instant now = Instant.now();
         // NOTE It is necessary to do the "check if exists, otherwise insert" atomic
-        Instant createdAt = threadIdToCreatedAtCache.get(threadChannelId, any -> now);
+        Instant createdAt = threadIdToCreatedAtCache.get(threadChannelId, _ -> now);
         return createdAt != now;
     }
 

application/src/main/java/org/togetherjava/tjbot/features/mediaonly/MediaOnlyChannelListener.java

@@ -46,7 +46,7 @@ public void onMessageReceived(MessageReceivedEvent event) {
         }
 
         if (messageHasNoMediaAttached(message)) {
-            message.delete().flatMap(any -> dmUser(message)).queue(any -> {
+            message.delete().flatMap(_ -> dmUser(message)).queue(_ -> {
             }, failure -> tempNotifyUserInChannel(message));
         }
     }

application/src/main/java/org/togetherjava/tjbot/features/moderation/TransferQuestionCommand.java

@@ -150,7 +150,7 @@ public void onModalSubmitted(ModalInteractionEvent event, List<String> args) {
         // Has been handled if original message was deleted by now.
         // Deleted messages cause retrieveMessageById to fail.
         Consumer<Message> notHandledAction =
-                any -> transferFlow(event, channelId, authorId, messageId);
+                _ -> transferFlow(event, channelId, authorId, messageId);
 
         Consumer<Throwable> handledAction = failure -> {
             if (failure instanceof ErrorResponseException errorResponseException

application/src/main/java/org/togetherjava/tjbot/features/moderation/attachment/BlacklistedAttachmentListener.java

@@ -49,7 +49,7 @@ public void onMessageReceived(MessageReceivedEvent event) {
     }
 
     private void handleBadMessage(Message message) {
-        message.delete().flatMap(any -> dmUser(message)).queue(any -> warnMods(message));
+        message.delete().flatMap(_ -> dmUser(message)).queue(_ -> warnMods(message));
     }
 
     private RestAction<Message> dmUser(Message message) {

application/src/main/java/org/togetherjava/tjbot/features/moderation/scam/ScamBlocker.java

@@ -255,7 +255,7 @@ private void dmUser(MessageReceivedEvent event) {
     }
 
     private void dmUser(Guild guild, long userId, JDA jda) {
-        jda.openPrivateChannelById(userId).flatMap(channel -> dmUser(guild, channel)).queue(any -> {
+        jda.openPrivateChannelById(userId).flatMap(channel -> dmUser(guild, channel)).queue(_ -> {
         }, failure -> logger.debug(
                 "Unable to send dm message to user {} in guild {} to inform them about a scam message being blocked",
                 userId, guild.getId(), failure));

application/src/main/java/org/togetherjava/tjbot/features/reminder/RemindRoutine.java

@@ -154,7 +154,7 @@ Failed to send a reminder with (authorID '{}') skipping it. This can be due to a
 
         int failureAttempts = pendingReminder.getFailureAttempts() + 1;
         Instant remindAt = Instant.now().plus(1, ChronoUnit.MINUTES);
-        database.write(any -> {
+        database.write(_ -> {
             pendingReminder.setRemindAt(remindAt);
             pendingReminder.setFailureAttempts(failureAttempts);
             pendingReminder.insert();

application/src/main/java/org/togetherjava/tjbot/features/utils/LinkPreviews.java

@@ -63,7 +63,7 @@ public static CompletableFuture<List<LinkPreview>> createLinkPreviews(List<Strin
             .toList();
 
         var allDoneTask = CompletableFuture.allOf(tasks.toArray(CompletableFuture[]::new));
-        return allDoneTask.thenApply(any -> extractResults(tasks)).exceptionally(e -> {
+        return allDoneTask.thenApply(_ -> extractResults(tasks)).exceptionally(e -> {
             logger.error("Unknown error during link preview creation", e);
             return List.of();
         });

build.gradle

@@ -55,7 +55,7 @@ subprojects {
     java {
         toolchain {
             // Nails the Java-Version of every Subproject
-            languageVersion = JavaLanguageVersion.of(21)
+            languageVersion = JavaLanguageVersion.of(22)
         }
     }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew.bat

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 @rem
 @rem Copyright 2015 the original author or authors.
 @rem
@@ -90,3 +91,97 @@ exit /b %EXIT_CODE%
 if "%OS%"=="Windows_NT" endlocal
 
 :omega
+=======
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
+>>>>>>> 78d0197 (upgrade to java 22)