Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

springboot 3.1.2 #27

Merged
merged 12 commits into from
Sep 22, 2023
Merged

springboot 3.1.2 #27

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
756d3ea
springboot 3.1.2
AbdelHedhili Aug 18, 2023
1b72d1f
Merge branch 'main' into springboot3
AbdelHedhili Aug 18, 2023
91da49d
fix swagger-ui
AbdelHedhili Aug 31, 2023
05a5431
pl.project13.maven:io.github.git-commit-id -> io.github.git-commit-id…
jonenst Sep 7, 2023
1199cf6
Merge commit '74844f19ba026ab64c4b816ee32a021f2cb88d13' into springboot3
jonenst Sep 7, 2023
2b388dd
spring cloud stream source (deprecated) -> output-bindings
jonenst Sep 8, 2023
7809210
wrap loadflow parameters of json notification messages in an object f…
jonenst Sep 13, 2023
a254fc6
output-bindings readd suffixes??
jonenst Sep 14, 2023
2f24bed
wip workaround hibernate change ???
jonenst Sep 14, 2023
2a05da3
remove workaround springboot 3.1.3 hibernate 6.2.7 HH-16811
jonenst Sep 21, 2023
0b3f8cd
springboot3 released in parent15
jonenst Sep 21, 2023
260c4a4
Merge commit '7348659e5308b421d1233df96ca611caeefdc622' into springboot3
jonenst Sep 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-parent-ws</artifactId>
<version>12</version>
<version>14</version>
<relativePath/>
</parent>

Expand Down Expand Up @@ -42,7 +42,7 @@
</developers>

<properties>
<gridsuite-dependencies.version>25</gridsuite-dependencies.version>
<gridsuite-dependencies.version>26</gridsuite-dependencies.version>
<liquibase-hibernate-package>org.gridsuite.shortcircuit.server</liquibase-hibernate-package>
<mockito-inline.version>3.11.1</mockito-inline.version>
</properties>
Expand Down Expand Up @@ -218,10 +218,8 @@
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream</artifactId>
<type>test-jar</type>
<artifactId>spring-cloud-stream-test-binder</artifactId>
<scope>test</scope>
<classifier>test-binder</classifier>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/gridsuite/shortcircuit/server/entities/FaultEmbeddable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
import lombok.Getter;
import lombok.NoArgsConstructor;

import javax.persistence.Column;
import javax.persistence.Embeddable;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;

/**
* @author Nicolas Noir <nicolas.noir at rte-france.com>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/gridsuite/shortcircuit/server/entities/FaultResultEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import lombok.NoArgsConstructor;
import lombok.Setter;

import javax.persistence.*;
import jakarta.persistence.*;
import java.util.List;
import java.util.UUID;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/gridsuite/shortcircuit/server/entities/FeederResultEmbeddable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import lombok.Getter;
import lombok.NoArgsConstructor;

import javax.persistence.Column;
import javax.persistence.Embeddable;
import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;

/**
* @author Nicolas Noir <nicolas.noir at rte-france.com>
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/gridsuite/shortcircuit/server/entities/GlobalStatusEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
import lombok.Getter;
import lombok.NoArgsConstructor;

import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import java.io.Serializable;
import java.util.UUID;

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/gridsuite/shortcircuit/server/entities/LimitViolationEmbeddable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
import lombok.Getter;
import lombok.NoArgsConstructor;

import javax.persistence.Column;
import javax.persistence.Embeddable;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;

/**
* @author Nicolas Noir <nicolas.noir at rte-france.com>
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/org/gridsuite/shortcircuit/server/entities/ShortCircuitAnalysisResultEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import lombok.Getter;
import lombok.NoArgsConstructor;

import javax.persistence.*;
import jakarta.persistence.*;
import java.time.ZonedDateTime;
import java.util.Set;
import java.util.UUID;
Expand Down
1 change: 0 additions & 1 deletion src/test/java/org/gridsuite/shortcircuit/server/ShortCircuitAnalysisControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,6 @@ public void stopTest() throws Exception {
assertNotNull(output.receive(TIMEOUT, shortCircuitAnalysisRunDestination));
mockMvc.perform(put("/" + VERSION + "/results/{resultUuid}/stop" + "?receiver=me", RESULT_UUID_TO_STOP))
.andExpect(status().isOk());
assertNotNull(output.receive(TIMEOUT, shortCircuitAnalysisCancelDestination));
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need to find another workaround (see comment line 446) or fix this correctly

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Problem is the consumed message are no longer available on the queue so checking the output doesn't cut it anymore. I don't understand how this relates to the comment you mentioned. This problem happened with all the tests containing checks on consumed messages.


Message<byte[]> message = output.receive(TIMEOUT, shortCircuitAnalysisStoppedDestination);
assertNotNull(message);
Expand Down