Skip to content

Springboot 3.3.3 migration #106

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

Merged
merged 3 commits into from
Sep 18, 2024
Merged

Springboot 3.3.3 migration #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd4b6a5
Springboot 3.3.2 migration
Aug 30, 2024
56b8fef
update depenedencies version
Aug 30, 2024
7cb8411
change denpendency version
Sep 5, 2024
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
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-parent-ws</artifactId>
<version>19</version>
<version>20</version>
<relativePath/>
</parent>

Expand All @@ -32,7 +32,7 @@
</scm>

<properties>
<gridsuite-dependencies.version>31</gridsuite-dependencies.version>
<gridsuite-dependencies.version>33</gridsuite-dependencies.version>
<string-template.version>4.3.1</string-template.version>
<liquibase-hibernate-package>org.gridsuite.mapping.server</liquibase-hibernate-package>
</properties>
Expand Down Expand Up @@ -183,7 +183,7 @@
</dependency>
<dependency>
<groupId>org.wiremock</groupId>
<artifactId>wiremock</artifactId>
<artifactId>wiremock-jetty12</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/gridsuite/mapping/server/model/AutomatonEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public AutomatonEntity(MappingEntity mapping, Automaton automaton) {
this.model = automaton.getModel();
this.setGroup = automaton.getSetGroup();
this.properties = automaton.getProperties() != null ? automaton.getProperties().stream()
.map(basicProperty -> new AutomatonPropertyEntity(newID, basicProperty))
.map(basicProperty -> new AutomatonPropertyEntity(newID, basicProperty, this))
.collect(Collectors.toList()) : null;
}

Expand All @@ -73,7 +73,7 @@ public AutomatonEntity(MappingEntity mapping, AutomatonEntity automatonToCopy) {
this.model = automatonToCopy.getModel();
this.setGroup = automatonToCopy.getSetGroup();
this.properties = automatonToCopy.getProperties().stream()
.map(automatonPropertyEntity -> new AutomatonPropertyEntity(newID, automatonPropertyEntity))
.map(automatonPropertyEntity -> new AutomatonPropertyEntity(newID, automatonPropertyEntity, this))
.collect(Collectors.toList());
}
}
6 changes: 4 additions & 2 deletions src/main/java/org/gridsuite/mapping/server/model/AutomatonPropertyEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,18 +50,20 @@ public class AutomatonPropertyEntity implements Serializable {
@MapsId("automatonId")
private AutomatonEntity automaton;

public AutomatonPropertyEntity(UUID automatonId, AutomatonPropertyEntity automatonPropertyEntity) {
public AutomatonPropertyEntity(UUID automatonId, AutomatonPropertyEntity automatonPropertyEntity, AutomatonEntity automaton) {
this.automatonId = automatonId;
this.name = automatonPropertyEntity.getName();
this.type = automatonPropertyEntity.getType();
this.value = automatonPropertyEntity.getValue();
this.automaton = automaton;
}

public AutomatonPropertyEntity(UUID automatonId, BasicProperty basicProperty) {
public AutomatonPropertyEntity(UUID automatonId, BasicProperty basicProperty, AutomatonEntity automaton) {
this.automatonId = automatonId;
this.name = basicProperty.getName();
this.type = basicProperty.getType();
this.value = basicProperty.getValue();
this.automaton = automaton;
}

}
Loading