Migration

Author: Rakambda

miner/src/main/java/fr/rakambda/channelpointsminer/miner/util/json/JacksonUtils.java

@@ -1,5 +1,6 @@
 package fr.rakambda.channelpointsminer.miner.util.json;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonSetter.Value;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -53,7 +54,7 @@ public static JsonMapper getMapper(){
 					.visibility(GETTER, NONE)
 					.visibility(SETTER, NONE)
 					.visibility(CREATOR, NONE)
-					.serializationInclusion(NON_NULL)
+					.defaultPropertyInclusion(JsonInclude.Value.construct(NON_NULL, NON_NULL))
 					.withConfigOverride(List.class, o -> o.setSetterInfo(Value.forValueNulls(AS_EMPTY)))
 					.addModule(new JavaTimeModule())
 					.build();

viewer/build.gradle.kts

@@ -17,7 +17,7 @@ ext["junit-jupiter.version"] = libs.versions.junitVersion.get()
 dependencies {
     implementation("org.springframework.boot:spring-boot-starter-data-jpa")
     implementation("org.springframework.boot:spring-boot-starter-thymeleaf")
-    implementation("org.springframework.boot:spring-boot-starter-web")
+    implementation("org.springframework.boot:spring-boot-starter-webmvc")
     implementation("org.apache.logging.log4j:log4j-layout-template-json")
     implementation("org.jspecify:jspecify:1.0.0")
 
@@ -32,6 +32,7 @@ dependencies {
     testImplementation(libs.bundles.jsonUnit)
 
     testImplementation("org.springframework.boot:spring-boot-starter-test")
+    testImplementation("org.springframework.boot:spring-boot-starter-webmvc-test")
 
     annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
     annotationProcessor("org.projectlombok:lombok")

viewer/src/main/java/fr/rakambda/channelpointsminer/viewer/config/HibernateConfig.java

@@ -2,7 +2,7 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
-import org.springframework.boot.autoconfigure.orm.jpa.HibernatePropertiesCustomizer;
+import org.springframework.boot.hibernate.autoconfigure.HibernatePropertiesCustomizer;
 import org.springframework.context.annotation.Configuration;
 import javax.sql.DataSource;
 import java.sql.Connection;

viewer/src/test/java/fr/rakambda/channelpointsminer/viewer/api/ApiControllerTest.java

@@ -3,7 +3,8 @@
 import fr.rakambda.channelpointsminer.viewer.api.data.BalanceData;
 import fr.rakambda.channelpointsminer.viewer.api.data.ChannelData;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
 import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 import org.junit.jupiter.api.Test;
@@ -14,6 +15,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
+@SpringBootTest
 @WebMvcTest(ApiController.class)
 class ApiControllerTest{
     @MockitoBean