From b2639c604892cfe307698b5742d036439377e7c5 Mon Sep 17 00:00:00 2001
From: Franck LECUYER <franck.lecuyer@rte-france.com>
Date: Mon, 23 Dec 2024 15:14:44 +0100
Subject: [PATCH 1/4] upgrade to gridsuite dependencies 36

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3b990d6..661310e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
     </developers>
 
     <properties>
-        <gridsuite-dependencies.version>35</gridsuite-dependencies.version>
+        <gridsuite-dependencies.version>36</gridsuite-dependencies.version>
         <liquibase-hibernate-package>org.gridsuite.sensitivityanalysis.server</liquibase-hibernate-package>
         <db-util.version>1.0.5</db-util.version>
         <mockwebserver3.version>5.0.0-alpha.14</mockwebserver3.version>

From 97364d8398cbabfa883e0ba03205ddaa0f89841c Mon Sep 17 00:00:00 2001
From: Franck LECUYER <franck.lecuyer@rte-france.com>
Date: Wed, 8 Jan 2025 16:23:20 +0100
Subject: [PATCH 2/4] Remove powsybl-ws-commons version override

Signed-off-by: Franck LECUYER <franck.lecuyer@rte-france.com>
---
 pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index dd21ac8..d167e5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,11 +85,6 @@
     <dependencyManagement>
         <dependencies>
             <!-- overrides of imports -->
-            <dependency><!-- To remove when integrate in next release of gridsuite-dependencies or powsybl-ws-dependencies -->
-                <groupId>com.powsybl</groupId>
-                <artifactId>powsybl-ws-commons</artifactId>
-                <version>1.19.0</version>
-            </dependency>
             <dependency><!-- To remove when integrate in next release of gridsuite-dependencies or powsybl-ws-dependencies -->
                 <groupId>com.squareup.okhttp3</groupId>
                 <artifactId>okhttp-bom</artifactId>

From e48c694000627dd089c1a8c6e9768c572a33700a Mon Sep 17 00:00:00 2001
From: Franck LECUYER <franck.lecuyer@rte-france.com>
Date: Thu, 9 Jan 2025 16:57:13 +0100
Subject: [PATCH 3/4] Add again powsybl-ws-commons version override

Signed-off-by: Franck LECUYER <franck.lecuyer@rte-france.com>
---
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pom.xml b/pom.xml
index d167e5d..fe841e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,6 +86,11 @@
         <dependencies>
             <!-- overrides of imports -->
             <dependency><!-- To remove when integrate in next release of gridsuite-dependencies or powsybl-ws-dependencies -->
+                <groupId>com.powsybl</groupId>
+                <artifactId>powsybl-ws-commons</artifactId>
+                <version>1.19.0</version>
+            </dependency>
+            <dependency>
                 <groupId>com.squareup.okhttp3</groupId>
                 <artifactId>okhttp-bom</artifactId>
                 <version>${mockwebserver3.version}</version>

From 7a6c6ae748e55a63d14d6bef02b33f7b11c2dd82 Mon Sep 17 00:00:00 2001
From: Franck LECUYER <franck.lecuyer@rte-france.com>
Date: Fri, 10 Jan 2025 13:02:58 +0100
Subject: [PATCH 4/4] Replace temporarly null provider with "default-provider"
 (waiting for fix in powsybl-ws-commons handling null provider) Remove
 powsybl-ws-commons version override

Signed-off-by: Franck LECUYER <franck.lecuyer@rte-france.com>
---
 pom.xml                                                      | 5 -----
 .../server/service/SensitivityAnalysisParametersService.java | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index fe841e5..c4ce36f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,11 +85,6 @@
     <dependencyManagement>
         <dependencies>
             <!-- overrides of imports -->
-            <dependency><!-- To remove when integrate in next release of gridsuite-dependencies or powsybl-ws-dependencies -->
-                <groupId>com.powsybl</groupId>
-                <artifactId>powsybl-ws-commons</artifactId>
-                <version>1.19.0</version>
-            </dependency>
             <dependency>
                 <groupId>com.squareup.okhttp3</groupId>
                 <artifactId>okhttp-bom</artifactId>
diff --git a/src/main/java/org/gridsuite/sensitivityanalysis/server/service/SensitivityAnalysisParametersService.java b/src/main/java/org/gridsuite/sensitivityanalysis/server/service/SensitivityAnalysisParametersService.java
index 785efdf..17a91a7 100644
--- a/src/main/java/org/gridsuite/sensitivityanalysis/server/service/SensitivityAnalysisParametersService.java
+++ b/src/main/java/org/gridsuite/sensitivityanalysis/server/service/SensitivityAnalysisParametersService.java
@@ -138,7 +138,7 @@ public NonEvacuatedEnergyRunContext createNonEvacuatedEnergyRunContext(UUID netw
                 variantId,
                 nonEvacuatedEnergyInputData,
                 receiver,
-                provider,
+                provider != null ? provider : "default-provider", // TODO : remove test on provider null when fix in powsybl-ws-commons will handle null provider
                 reportInfos,
                 userId);