diff --git a/pom.xml b/pom.xml index 6518413f..31be285f 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ powsybl/java-dynawo:3.0.0 - 43.0.0 + 43.2.0 org.gridsuite.securityanalysis.server 1.0.5 5.0.0-alpha.14 diff --git a/src/main/java/org/gridsuite/securityanalysis/server/entities/ContingencyLimitViolationEntity.java b/src/main/java/org/gridsuite/securityanalysis/server/entities/ContingencyLimitViolationEntity.java index 1bdd6079..85e4dbb5 100644 --- a/src/main/java/org/gridsuite/securityanalysis/server/entities/ContingencyLimitViolationEntity.java +++ b/src/main/java/org/gridsuite/securityanalysis/server/entities/ContingencyLimitViolationEntity.java @@ -18,12 +18,12 @@ * @author Kevin Le Saulnier */ -@Data @NoArgsConstructor @SuperBuilder @Getter @Entity @FieldNameConstants +@EqualsAndHashCode(callSuper = true) @Table(name = "contingency_limit_violation") public class ContingencyLimitViolationEntity extends AbstractLimitViolationEntity { @ManyToOne(fetch = FetchType.LAZY) diff --git a/src/main/java/org/gridsuite/securityanalysis/server/entities/PreContingencyLimitViolationEntity.java b/src/main/java/org/gridsuite/securityanalysis/server/entities/PreContingencyLimitViolationEntity.java index 01b75e8a..061ddf0d 100644 --- a/src/main/java/org/gridsuite/securityanalysis/server/entities/PreContingencyLimitViolationEntity.java +++ b/src/main/java/org/gridsuite/securityanalysis/server/entities/PreContingencyLimitViolationEntity.java @@ -9,12 +9,9 @@ import com.powsybl.iidm.network.Network; import com.powsybl.security.LimitViolation; import com.powsybl.security.results.PreContingencyResult; +import lombok.*; import org.gridsuite.computation.utils.ComputationResultUtils; import jakarta.persistence.*; -import lombok.Data; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; import lombok.experimental.FieldNameConstants; import lombok.experimental.SuperBuilder; @@ -26,12 +23,12 @@ * @author Kevin Le Saulnier */ -@Data @NoArgsConstructor @SuperBuilder @Getter @Entity @FieldNameConstants +@EqualsAndHashCode(callSuper = true) @Table(name = "pre_contingency_limit_violation") public class PreContingencyLimitViolationEntity extends AbstractLimitViolationEntity { @ManyToOne(fetch = FetchType.LAZY) diff --git a/src/test/java/org/gridsuite/securityanalysis/server/SecurityAnalysisControllerTest.java b/src/test/java/org/gridsuite/securityanalysis/server/SecurityAnalysisControllerTest.java index d900cf74..4bcb0787 100644 --- a/src/test/java/org/gridsuite/securityanalysis/server/SecurityAnalysisControllerTest.java +++ b/src/test/java/org/gridsuite/securityanalysis/server/SecurityAnalysisControllerTest.java @@ -47,11 +47,11 @@ 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.OutputDestination; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.messaging.Message; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.util.ReflectionTestUtils; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MvcResult; @@ -111,19 +111,19 @@ class SecurityAnalysisControllerTest { @Autowired private MockMvc mockMvc; - @MockBean + @MockitoBean private NetworkStoreService networkStoreService; - @MockBean + @MockitoBean private ActionsService actionsService; - @MockBean + @MockitoBean private ReportService reportService; @Autowired private LoadFlowService loadFlowService; - @MockBean + @MockitoBean private UuidGeneratorService uuidGeneratorService; @Autowired