diff --git a/pom.xml b/pom.xml index a2e29249..7f7786dd 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ - 43.1.0 + 43.2.0 1.12.0 4.3.1 diff --git a/src/main/java/org/gridsuite/filter/server/error/FilterException.java b/src/main/java/org/gridsuite/filter/server/error/FilterException.java index c4e8ae17..5da59725 100644 --- a/src/main/java/org/gridsuite/filter/server/error/FilterException.java +++ b/src/main/java/org/gridsuite/filter/server/error/FilterException.java @@ -7,7 +7,7 @@ package org.gridsuite.filter.server.error; import com.powsybl.ws.commons.error.AbstractBusinessException; -import org.jetbrains.annotations.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.Objects; diff --git a/src/main/java/org/gridsuite/filter/server/error/RestResponseEntityExceptionHandler.java b/src/main/java/org/gridsuite/filter/server/error/RestResponseEntityExceptionHandler.java index 83c1a719..007da3a6 100644 --- a/src/main/java/org/gridsuite/filter/server/error/RestResponseEntityExceptionHandler.java +++ b/src/main/java/org/gridsuite/filter/server/error/RestResponseEntityExceptionHandler.java @@ -8,7 +8,7 @@ import com.powsybl.ws.commons.error.AbstractBaseRestExceptionHandler; import com.powsybl.ws.commons.error.ServerNameProvider; -import org.jetbrains.annotations.NotNull; +import jakarta.validation.constraints.NotNull; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ControllerAdvice; diff --git a/src/test/java/org/gridsuite/filter/server/FilterEntityControllerTest.java b/src/test/java/org/gridsuite/filter/server/FilterEntityControllerTest.java index 8dbdd4dc..351430f1 100644 --- a/src/test/java/org/gridsuite/filter/server/FilterEntityControllerTest.java +++ b/src/test/java/org/gridsuite/filter/server/FilterEntityControllerTest.java @@ -52,12 +52,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.boot.test.mock.mockito.SpyBean; import org.springframework.cloud.stream.binder.test.OutputDestination; import org.springframework.cloud.stream.binder.test.TestChannelBinderConfiguration; import org.springframework.messaging.Message; import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.test.context.bean.override.mockito.MockitoSpyBean; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.MockMvc; import org.springframework.util.CollectionUtils; @@ -107,10 +107,10 @@ public class FilterEntityControllerTest { @Autowired ObjectMapper objectMapper = new ObjectMapper(); - @MockBean + @MockitoBean private NetworkStoreService networkStoreService; - @SpyBean + @MockitoSpyBean private DirectoryService directoryService; public static final SortedSet COUNTRIES1 = new TreeSet<>(Collections.singleton("France")); diff --git a/src/test/java/org/gridsuite/filter/server/GlobalFilterControllerTest.java b/src/test/java/org/gridsuite/filter/server/GlobalFilterControllerTest.java index 42d6958e..c666f3f8 100644 --- a/src/test/java/org/gridsuite/filter/server/GlobalFilterControllerTest.java +++ b/src/test/java/org/gridsuite/filter/server/GlobalFilterControllerTest.java @@ -29,9 +29,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.cloud.stream.binder.test.TestChannelBinderConfiguration; import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.MockMvc; import org.springframework.util.LinkedMultiValueMap; @@ -66,7 +66,7 @@ public class GlobalFilterControllerTest { @Autowired ObjectMapper objectMapper = new ObjectMapper(); - @MockBean + @MockitoBean private NetworkStoreService networkStoreService; private static final UUID NETWORK_UUID = UUID.fromString("7928181c-7977-4592-ba19-88027e4254e4");