commit 2dc312f77923d73674f6152f1f74632c53b671e8 parent 7b37d2ccd2a3e267b02b6f43252caf9a4e938807 Author: Wim Dupont <wim@wimdupont.com> Date: Thu, 30 Jul 2026 19:04:27 +0200 upgrade and added mad angel boss Diffstat:
7 files changed, 22 insertions(+), 10 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>4.0.2</version> + <version>4.1.0</version> <relativePath/> <!-- lookup parent from repository --> </parent> <groupId>com.wimdupont</groupId> @@ -16,7 +16,7 @@ <properties> <java.version>25</java.version> - <dv8ation.jda.version>6.3.0</dv8ation.jda.version> + <dv8ation.jda.version>6.5.0</dv8ation.jda.version> </properties> <dependencies> diff --git a/src/main/java/com/wimdupont/sxcybot/client/GrandExchangeClient.java b/src/main/java/com/wimdupont/sxcybot/client/GrandExchangeClient.java @@ -1,12 +1,13 @@ package com.wimdupont.sxcybot.client; -import com.fasterxml.jackson.databind.ObjectMapper; 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.restclient.RestTemplateBuilder; import org.springframework.stereotype.Component; +import tools.jackson.core.JacksonException; +import tools.jackson.databind.ObjectMapper; import java.time.Duration; import java.util.Map; @@ -32,7 +33,7 @@ public class GrandExchangeClient { try { return NumberFormatter.format(objectMapper .convertValue(((Map<String, Object>) result).values().iterator().next(), OsrsItem.class).price()); - } catch (IllegalArgumentException e) { + } catch (Exception e) { throw new EntityNotFoundException(String.format("Item with name %s not found.", itemName)); } } else { diff --git a/src/main/java/com/wimdupont/sxcybot/config/AppConfig.java b/src/main/java/com/wimdupont/sxcybot/config/AppConfig.java @@ -1,8 +1,8 @@ package com.wimdupont.sxcybot.config; -import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import tools.jackson.databind.ObjectMapper; @Configuration @SuppressWarnings("unused") diff --git a/src/main/java/com/wimdupont/sxcybot/model/OsrsBossKc.java b/src/main/java/com/wimdupont/sxcybot/model/OsrsBossKc.java @@ -1,7 +1,8 @@ package com.wimdupont.sxcybot.model; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; + +import tools.jackson.databind.annotation.JsonDeserialize; +import tools.jackson.databind.annotation.JsonPOJOBuilder; @JsonDeserialize(builder = OsrsBossKc.Builder.class) public record OsrsBossKc( diff --git a/src/main/java/com/wimdupont/sxcybot/model/OsrsStat.java b/src/main/java/com/wimdupont/sxcybot/model/OsrsStat.java @@ -1,7 +1,8 @@ package com.wimdupont.sxcybot.model; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; + +import tools.jackson.databind.annotation.JsonDeserialize; +import tools.jackson.databind.annotation.JsonPOJOBuilder; @JsonDeserialize(builder = OsrsStat.Builder.class) public record OsrsStat( diff --git a/src/main/resources/db/migration/V1_32__add_mad_angel_boss.sql b/src/main/resources/db/migration/V1_32__add_mad_angel_boss.sql @@ -0,0 +1,9 @@ +UPDATE osrs_hiscore_boss SET order_value = order_value+1 + WHERE order_value >= 54; + +INSERT INTO osrs_hiscore_boss +VALUES +(UUID(),"Mad Angel", 1, 54, 1); + +UPDATE osrs_hiscore_boss SET order_value = 55 where name = 'Maggot King'; +UPDATE osrs_hiscore_boss SET order_value = 56 where name = 'Mimic'; diff --git a/src/test/java/com/wimdupont/sxcybot/client/GrandExchangeClientTest.java b/src/test/java/com/wimdupont/sxcybot/client/GrandExchangeClientTest.java @@ -1,6 +1,5 @@ package com.wimdupont.sxcybot.client; -import com.fasterxml.jackson.databind.ObjectMapper; import com.wimdupont.sxcybot.exceptions.EntityNotFoundException; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import org.junit.jupiter.api.BeforeEach; @@ -8,6 +7,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.context.junit.jupiter.SpringExtension; +import tools.jackson.databind.ObjectMapper; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull;