diff --git a/pom.xml b/pom.xml index 0df6b7b..1646ac9 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ - 46.0.0 + 47.0.0 org.gridsuite.actions.server gridsuite org.gridsuite:actions-server diff --git a/src/main/java/org/gridsuite/actions/server/ContingencyListService.java b/src/main/java/org/gridsuite/actions/server/ContingencyListService.java index 0c6ecfd..cd85191 100644 --- a/src/main/java/org/gridsuite/actions/server/ContingencyListService.java +++ b/src/main/java/org/gridsuite/actions/server/ContingencyListService.java @@ -9,8 +9,8 @@ import com.powsybl.commons.PowsyblException; import com.powsybl.contingency.Contingency; import com.powsybl.contingency.ContingencyElement; -import com.powsybl.contingency.contingency.list.ContingencyList; -import com.powsybl.contingency.contingency.list.IdentifierContingencyList; +import com.powsybl.contingency.list.ContingencyList; +import com.powsybl.contingency.list.IdentifierContingencyList; import com.powsybl.iidm.network.Connectable; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.Terminal; diff --git a/src/main/java/org/gridsuite/actions/server/dto/FilterBasedContingencyList.java b/src/main/java/org/gridsuite/actions/server/dto/FilterBasedContingencyList.java index d06918b..871dafb 100644 --- a/src/main/java/org/gridsuite/actions/server/dto/FilterBasedContingencyList.java +++ b/src/main/java/org/gridsuite/actions/server/dto/FilterBasedContingencyList.java @@ -6,7 +6,7 @@ */ package org.gridsuite.actions.server.dto; -import com.powsybl.contingency.contingency.list.ContingencyList; +import com.powsybl.contingency.list.ContingencyList; import com.powsybl.iidm.network.Network; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/src/main/java/org/gridsuite/actions/server/dto/IdBasedContingencyList.java b/src/main/java/org/gridsuite/actions/server/dto/IdBasedContingencyList.java index 650427c..2be54cc 100644 --- a/src/main/java/org/gridsuite/actions/server/dto/IdBasedContingencyList.java +++ b/src/main/java/org/gridsuite/actions/server/dto/IdBasedContingencyList.java @@ -6,8 +6,8 @@ */ package org.gridsuite.actions.server.dto; -import com.powsybl.contingency.contingency.list.ContingencyList; -import com.powsybl.contingency.contingency.list.IdentifierContingencyList; +import com.powsybl.contingency.list.ContingencyList; +import com.powsybl.contingency.list.IdentifierContingencyList; import com.powsybl.iidm.network.Network; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/src/main/java/org/gridsuite/actions/server/dto/PersistentContingencyList.java b/src/main/java/org/gridsuite/actions/server/dto/PersistentContingencyList.java index a74e9b3..58885d2 100644 --- a/src/main/java/org/gridsuite/actions/server/dto/PersistentContingencyList.java +++ b/src/main/java/org/gridsuite/actions/server/dto/PersistentContingencyList.java @@ -6,7 +6,7 @@ */ package org.gridsuite.actions.server.dto; -import com.powsybl.contingency.contingency.list.ContingencyList; +import com.powsybl.contingency.list.ContingencyList; import com.powsybl.iidm.network.Network; import java.util.Map; diff --git a/src/main/java/org/gridsuite/actions/server/entities/IdBasedContingencyListEntity.java b/src/main/java/org/gridsuite/actions/server/entities/IdBasedContingencyListEntity.java index 2793fc5..50a39a6 100644 --- a/src/main/java/org/gridsuite/actions/server/entities/IdBasedContingencyListEntity.java +++ b/src/main/java/org/gridsuite/actions/server/entities/IdBasedContingencyListEntity.java @@ -6,7 +6,7 @@ */ package org.gridsuite.actions.server.entities; -import com.powsybl.contingency.contingency.list.IdentifierContingencyList; +import com.powsybl.contingency.list.IdentifierContingencyList; import com.powsybl.iidm.network.identifiers.IdBasedNetworkElementIdentifier; import com.powsybl.iidm.network.identifiers.NetworkElementIdentifier; import com.powsybl.iidm.network.identifiers.NetworkElementIdentifierContingencyList; diff --git a/src/test/java/org/gridsuite/actions/server/ContingencyListControllerTest.java b/src/test/java/org/gridsuite/actions/server/ContingencyListControllerTest.java index 87cebe1..56bc9a9 100644 --- a/src/test/java/org/gridsuite/actions/server/ContingencyListControllerTest.java +++ b/src/test/java/org/gridsuite/actions/server/ContingencyListControllerTest.java @@ -16,7 +16,7 @@ import com.github.tomakehurst.wiremock.client.MappingBuilder; import com.github.tomakehurst.wiremock.client.WireMock; import com.powsybl.contingency.*; -import com.powsybl.contingency.contingency.list.IdentifierContingencyList; +import com.powsybl.contingency.list.IdentifierContingencyList; import com.powsybl.contingency.json.ContingencyJsonModule; import com.powsybl.iidm.network.IdentifiableType; import com.powsybl.iidm.network.Network;