Skip to content

Commit bd4b6a5

Browse files
author
Seddik Yengui
committed
Springboot 3.3.2 migration
Signed-off-by: Seddik Yengui <[email protected]>
1 parent e2470a0 commit bd4b6a5

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@
183183
</dependency>
184184
<dependency>
185185
<groupId>org.wiremock</groupId>
186-
<artifactId>wiremock</artifactId>
186+
<artifactId>wiremock-jetty12</artifactId>
187187
<scope>test</scope>
188188
</dependency>
189189
</dependencies>

src/main/java/org/gridsuite/mapping/server/model/AutomatonEntity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public AutomatonEntity(MappingEntity mapping, Automaton automaton) {
6161
this.model = automaton.getModel();
6262
this.setGroup = automaton.getSetGroup();
6363
this.properties = automaton.getProperties() != null ? automaton.getProperties().stream()
64-
.map(basicProperty -> new AutomatonPropertyEntity(newID, basicProperty))
64+
.map(basicProperty -> new AutomatonPropertyEntity(newID, basicProperty, this))
6565
.collect(Collectors.toList()) : null;
6666
}
6767

@@ -73,7 +73,7 @@ public AutomatonEntity(MappingEntity mapping, AutomatonEntity automatonToCopy) {
7373
this.model = automatonToCopy.getModel();
7474
this.setGroup = automatonToCopy.getSetGroup();
7575
this.properties = automatonToCopy.getProperties().stream()
76-
.map(automatonPropertyEntity -> new AutomatonPropertyEntity(newID, automatonPropertyEntity))
76+
.map(automatonPropertyEntity -> new AutomatonPropertyEntity(newID, automatonPropertyEntity, this))
7777
.collect(Collectors.toList());
7878
}
7979
}

src/main/java/org/gridsuite/mapping/server/model/AutomatonPropertyEntity.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,20 @@ public class AutomatonPropertyEntity implements Serializable {
5050
@MapsId("automatonId")
5151
private AutomatonEntity automaton;
5252

53-
public AutomatonPropertyEntity(UUID automatonId, AutomatonPropertyEntity automatonPropertyEntity) {
53+
public AutomatonPropertyEntity(UUID automatonId, AutomatonPropertyEntity automatonPropertyEntity, AutomatonEntity automaton) {
5454
this.automatonId = automatonId;
5555
this.name = automatonPropertyEntity.getName();
5656
this.type = automatonPropertyEntity.getType();
5757
this.value = automatonPropertyEntity.getValue();
58+
this.automaton = automaton;
5859
}
5960

60-
public AutomatonPropertyEntity(UUID automatonId, BasicProperty basicProperty) {
61+
public AutomatonPropertyEntity(UUID automatonId, BasicProperty basicProperty, AutomatonEntity automaton) {
6162
this.automatonId = automatonId;
6263
this.name = basicProperty.getName();
6364
this.type = basicProperty.getType();
6465
this.value = basicProperty.getValue();
66+
this.automaton = automaton;
6567
}
6668

6769
}

0 commit comments

Comments
 (0)