Skip to content

Commit 883f9d8

Browse files
authored
springboot 3.4.9 (#201)
Signed-off-by: Abdelsalem <[email protected]>
1 parent c97091a commit 883f9d8

File tree

4 files changed

+9
-12
lines changed

4 files changed

+9
-12
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<properties>
4545

4646
<jib.from.image>powsybl/java-dynawo:3.0.0</jib.from.image>
47-
<gridsuite-dependencies.version>43.0.0</gridsuite-dependencies.version>
47+
<gridsuite-dependencies.version>43.2.0</gridsuite-dependencies.version>
4848
<liquibase-hibernate-package>org.gridsuite.securityanalysis.server</liquibase-hibernate-package>
4949
<db-util.version>1.0.5</db-util.version>
5050
<mockwebserver3.version>5.0.0-alpha.14</mockwebserver3.version>

src/main/java/org/gridsuite/securityanalysis/server/entities/ContingencyLimitViolationEntity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
* @author Kevin Le Saulnier <kevin.lesaulnier at rte-france.com>
1919
*/
2020

21-
@Data
2221
@NoArgsConstructor
2322
@SuperBuilder
2423
@Getter
2524
@Entity
2625
@FieldNameConstants
26+
@EqualsAndHashCode(callSuper = true)
2727
@Table(name = "contingency_limit_violation")
2828
public class ContingencyLimitViolationEntity extends AbstractLimitViolationEntity {
2929
@ManyToOne(fetch = FetchType.LAZY)

src/main/java/org/gridsuite/securityanalysis/server/entities/PreContingencyLimitViolationEntity.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,9 @@
99
import com.powsybl.iidm.network.Network;
1010
import com.powsybl.security.LimitViolation;
1111
import com.powsybl.security.results.PreContingencyResult;
12+
import lombok.*;
1213
import org.gridsuite.computation.utils.ComputationResultUtils;
1314
import jakarta.persistence.*;
14-
import lombok.Data;
15-
import lombok.Getter;
16-
import lombok.NoArgsConstructor;
17-
import lombok.Setter;
1815
import lombok.experimental.FieldNameConstants;
1916
import lombok.experimental.SuperBuilder;
2017

@@ -26,12 +23,12 @@
2623
* @author Kevin Le Saulnier <kevin.lesaulnier at rte-france.com>
2724
*/
2825

29-
@Data
3026
@NoArgsConstructor
3127
@SuperBuilder
3228
@Getter
3329
@Entity
3430
@FieldNameConstants
31+
@EqualsAndHashCode(callSuper = true)
3532
@Table(name = "pre_contingency_limit_violation")
3633
public class PreContingencyLimitViolationEntity extends AbstractLimitViolationEntity {
3734
@ManyToOne(fetch = FetchType.LAZY)

src/test/java/org/gridsuite/securityanalysis/server/SecurityAnalysisControllerTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@
4747
import org.springframework.beans.factory.annotation.Autowired;
4848
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
4949
import org.springframework.boot.test.context.SpringBootTest;
50-
import org.springframework.boot.test.mock.mockito.MockBean;
5150
import org.springframework.cloud.stream.binder.test.OutputDestination;
5251
import org.springframework.http.HttpHeaders;
5352
import org.springframework.http.MediaType;
5453
import org.springframework.messaging.Message;
54+
import org.springframework.test.context.bean.override.mockito.MockitoBean;
5555
import org.springframework.test.util.ReflectionTestUtils;
5656
import org.springframework.test.web.servlet.MockMvc;
5757
import org.springframework.test.web.servlet.MvcResult;
@@ -111,19 +111,19 @@ class SecurityAnalysisControllerTest {
111111
@Autowired
112112
private MockMvc mockMvc;
113113

114-
@MockBean
114+
@MockitoBean
115115
private NetworkStoreService networkStoreService;
116116

117-
@MockBean
117+
@MockitoBean
118118
private ActionsService actionsService;
119119

120-
@MockBean
120+
@MockitoBean
121121
private ReportService reportService;
122122

123123
@Autowired
124124
private LoadFlowService loadFlowService;
125125

126-
@MockBean
126+
@MockitoBean
127127
private UuidGeneratorService uuidGeneratorService;
128128

129129
@Autowired

0 commit comments

Comments
 (0)