From bd4b6a55304339b83af21fd922ffdbef1371fd7c Mon Sep 17 00:00:00 2001
From: Seddik Yengui <seddik.yengui@rte-france.com>
Date: Fri, 30 Aug 2024 17:10:23 +0200
Subject: [PATCH 1/3] Springboot 3.3.2 migration

Signed-off-by: Seddik Yengui <seddik.yengui@rte-france.com>
---
 pom.xml                                                     | 2 +-
 .../org/gridsuite/mapping/server/model/AutomatonEntity.java | 4 ++--
 .../mapping/server/model/AutomatonPropertyEntity.java       | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5a98018f..69c423a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -183,7 +183,7 @@
         </dependency>
         <dependency>
             <groupId>org.wiremock</groupId>
-            <artifactId>wiremock</artifactId>
+            <artifactId>wiremock-jetty12</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/src/main/java/org/gridsuite/mapping/server/model/AutomatonEntity.java b/src/main/java/org/gridsuite/mapping/server/model/AutomatonEntity.java
index 354feb1e..4357f24d 100644
--- a/src/main/java/org/gridsuite/mapping/server/model/AutomatonEntity.java
+++ b/src/main/java/org/gridsuite/mapping/server/model/AutomatonEntity.java
@@ -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;
     }
 
@@ -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());
     }
 }
diff --git a/src/main/java/org/gridsuite/mapping/server/model/AutomatonPropertyEntity.java b/src/main/java/org/gridsuite/mapping/server/model/AutomatonPropertyEntity.java
index 266586c6..d9768b7a 100644
--- a/src/main/java/org/gridsuite/mapping/server/model/AutomatonPropertyEntity.java
+++ b/src/main/java/org/gridsuite/mapping/server/model/AutomatonPropertyEntity.java
@@ -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;
     }
 
 }

From 56b8fef70c7739cb05584ea550db79c6032c6fe0 Mon Sep 17 00:00:00 2001
From: Seddik Yengui <seddik.yengui@rte-france.com>
Date: Fri, 30 Aug 2024 17:12:11 +0200
Subject: [PATCH 2/3] update depenedencies version

Signed-off-by: Seddik Yengui <seddik.yengui@rte-france.com>
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 69c423a3..834178fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>com.powsybl</groupId>
         <artifactId>powsybl-parent-ws</artifactId>
-        <version>19</version>
+        <version>20</version>
         <relativePath/>
     </parent>
 
@@ -32,7 +32,7 @@
     </scm>
 
     <properties>
-        <gridsuite-dependencies.version>31</gridsuite-dependencies.version>
+        <gridsuite-dependencies.version>32</gridsuite-dependencies.version>
         <string-template.version>4.3.1</string-template.version>
         <liquibase-hibernate-package>org.gridsuite.mapping.server</liquibase-hibernate-package>
     </properties>

From 7cb84118fc623602d88013bd3af0b0d8d9d682d3 Mon Sep 17 00:00:00 2001
From: Seddik Yengui <seddik.yengui@rte-france.com>
Date: Thu, 5 Sep 2024 14:03:01 +0200
Subject: [PATCH 3/3] change denpendency version

Signed-off-by: Seddik Yengui <seddik.yengui@rte-france.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 834178fc..fd99c6a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
     </scm>
 
     <properties>
-        <gridsuite-dependencies.version>32</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>