sxcybot

Discord bot for OSRS based channels
git clone git://git.wimdupont.com/sxcybot.git
Log | Files | Refs | README | LICENSE

commit 983e51f8baa7a5621c46836d69128e3d7623a568
parent 5b176fe7e5cbe11859da12d04706a01185924d6b
Author: Wim Dupont <wim@wimdupont.com>
Date:   Sat, 22 Nov 2025 11:57:06 +0100

spring boot 4 upgrade

Diffstat:
Mpom.xml | 6+++++-
Msrc/main/java/com/wimdupont/sxcybot/client/ClientErrorHandler.java | 9++++++++-
Msrc/main/java/com/wimdupont/sxcybot/client/GrandExchangeClient.java | 2+-
Msrc/main/java/com/wimdupont/sxcybot/client/HiScoreClient.java | 2+-
Msrc/main/java/com/wimdupont/sxcybot/client/WiseOldManClient.java | 2+-
5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>3.5.8</version> + <version>4.0.0</version> <relativePath/> <!-- lookup parent from repository --> </parent> <groupId>com.wimdupont</groupId> @@ -30,6 +30,10 @@ </dependency> <dependency> <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-restclient</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-test</artifactId> <scope>test</scope> </dependency> diff --git a/src/main/java/com/wimdupont/sxcybot/client/ClientErrorHandler.java b/src/main/java/com/wimdupont/sxcybot/client/ClientErrorHandler.java @@ -1,10 +1,14 @@ package com.wimdupont.sxcybot.client; +import jakarta.annotation.Nullable; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatusCode; import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.DefaultResponseErrorHandler; import java.io.IOException; +import java.net.URI; public class ClientErrorHandler extends DefaultResponseErrorHandler { @@ -15,7 +19,10 @@ public class ClientErrorHandler extends DefaultResponseErrorHandler { } @Override - public void handleError(ClientHttpResponse response) throws IOException { + public void handleError(ClientHttpResponse response, + HttpStatusCode statusCode, + @Nullable URI url, + @Nullable HttpMethod method) throws IOException { var errorMsg = String.format("No results found. (%s)", response.getStatusText()); if (channel != null) { channel.sendMessage(errorMsg).queue(); diff --git a/src/main/java/com/wimdupont/sxcybot/client/GrandExchangeClient.java b/src/main/java/com/wimdupont/sxcybot/client/GrandExchangeClient.java @@ -5,7 +5,7 @@ import com.wimdupont.sxcybot.exceptions.EntityNotFoundException; import com.wimdupont.sxcybot.model.OsrsItem; import com.wimdupont.sxcybot.util.NumberFormatter; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.stereotype.Component; import java.time.Duration; diff --git a/src/main/java/com/wimdupont/sxcybot/client/HiScoreClient.java b/src/main/java/com/wimdupont/sxcybot/client/HiScoreClient.java @@ -5,7 +5,7 @@ import com.wimdupont.sxcybot.model.HiscoreDto; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.stereotype.Component; import java.time.Duration; diff --git a/src/main/java/com/wimdupont/sxcybot/client/WiseOldManClient.java b/src/main/java/com/wimdupont/sxcybot/client/WiseOldManClient.java @@ -5,7 +5,7 @@ import com.wimdupont.sxcybot.model.wiseoldman.GroupDto; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.restclient.RestTemplateBuilder; import org.springframework.stereotype.Component; import java.time.Duration;