Merge remote-tracking branch 'origin/main' into junit/migrate5

powsybl · Oct 17, 2024 · 3e94079 · 3e94079
2 parents d6d8821 + 50f73ab
commit 3e94079
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 6 deletions.
diff --git a/...rk-store-server/src/main/resources/db/changelog/changesets/changelog_20241011T120000Z.xml b/...rk-store-server/src/main/resources/db/changelog/changesets/changelog_20241011T120000Z.xml
@@ -0,0 +1,16 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.1.xsd">
+    <changeSet author="bouhoursant" id="2986331049400-1">
+        <dropColumn tableName="battery" columnName="activepowercontrol"/>
+        <dropColumn tableName="generator" columnName="activepowercontrol"/>
+        <dropColumn tableName="generator" columnName="generatorstartup"/>
+        <dropColumn tableName="line" columnName="operatingstatus"/>
+        <dropColumn tableName="hvdcline" columnName="operatingstatus"/>
+        <dropColumn tableName="tieline" columnName="operatingstatus"/>
+        <dropColumn tableName="danglingline" columnName="operatingstatus"/>
+        <dropColumn tableName="twowindingstransformer" columnName="operatingstatus"/>
+        <dropColumn tableName="threewindingstransformer" columnName="operatingstatus"/>
+    </changeSet>
+</databaseChangeLog>
diff --git a/network-store-server/src/main/resources/db/changelog/db.changelog-master.yaml b/network-store-server/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -79,3 +79,7 @@ databaseChangeLog:
   - include:
       file: changesets/changelog_20240924T110000Z.xml
       relativeToChangelogFile: true
+
+  - include:
+      file: changesets/changelog_20241011T120000Z.xml
+      relativeToChangelogFile: true
diff --git a/...store-server/src/test/java/com/powsybl/network/store/server/NetworkStoreControllerIT.java b/...store-server/src/test/java/com/powsybl/network/store/server/NetworkStoreControllerIT.java
@@ -494,12 +494,12 @@ void test() throws Exception {
             .andExpect(jsonPath("data[0].id").value("idLine"))
             .andExpect(jsonPath("data[0].attributes.p1").value(100.))
             .andExpect(jsonPath("data[0].attributes.properties[\"property1\"]").value("newValue1"))
-            .andExpect(jsonPath("data[1].id").value("idLine2"))
-            .andExpect(jsonPath("data[1].attributes.p1").value(30.))
-            .andExpect(jsonPath("data[1].attributes.properties[\"property12\"]").value("value12"))
-            .andExpect(jsonPath("data[2].id").value("idLineWithoutFirstPosition"))
-            .andExpect(jsonPath("data[2].attributes.p1").value(0.))
-            .andExpect(jsonPath("data[2].attributes.properties[\"property1\"]").value("value1"));
+            .andExpect(jsonPath("data[1].id").value("idLineWithoutFirstPosition"))
+            .andExpect(jsonPath("data[1].attributes.p1").value(0.))
+            .andExpect(jsonPath("data[1].attributes.properties[\"property1\"]").value("value1"))
+            .andExpect(jsonPath("data[2].id").value("idLine2"))
+            .andExpect(jsonPath("data[2].attributes.p1").value(30.))
+            .andExpect(jsonPath("data[2].attributes.properties[\"property12\"]").value("value12"));
 
         mvc.perform(get("/" + VERSION + "/networks/" + NETWORK_UUID + "/" + Resource.INITIAL_VARIANT_NUM + "/voltage-levels/vl1/lines")
             .contentType(APPLICATION_JSON))

diff --git a/pom.xml b/pom.xml
@@ -49,6 +49,8 @@
 
     <properties>
         <sirocco.version>1.0</sirocco.version>
+        <!-- FIXME: powsybl-network-store modules'version is overloaded in the dependencies section.The overloads and this property below have to be removed at next powsybl-ws-dependencies.version upgrade -->
+        <powsybl-network-store.version>1.18.2</powsybl-network-store.version>
 
         <powsybl-ws-dependencies.version>2.15.0</powsybl-ws-dependencies.version>
 
@@ -75,6 +77,24 @@
     <dependencyManagement>
         <dependencies>
             <!-- overrides of imports -->
+            <!-- FIXME: to be removed at next powsybl-ws-dependencies upgrade  -->
+            <dependency>
+                <groupId>com.powsybl</groupId>
+                <artifactId>powsybl-network-store-iidm-impl</artifactId>
+                <version>${powsybl-network-store.version}</version>
+            </dependency>
+            <!-- FIXME: to be removed at next powsybl-ws-dependencies upgrade  -->
+            <dependency>
+                <groupId>com.powsybl</groupId>
+                <artifactId>powsybl-network-store-client</artifactId>
+                <version>${powsybl-network-store.version}</version>
+            </dependency>
+            <!-- FIXME: to be removed at next powsybl-ws-dependencies upgrade  -->
+            <dependency>
+                <groupId>com.powsybl</groupId>
+                <artifactId>powsybl-network-store-model</artifactId>
+                <version>${powsybl-network-store.version}</version>
+            </dependency>
 
             <!-- imports -->
             <dependency>