From 6770c0a44aff51b4c4fcc9d3ae597740691f518b Mon Sep 17 00:00:00 2001
From: HARPER Jon <jon.harper87@gmail.com>
Date: Wed, 30 Aug 2023 13:51:18 +0200
Subject: [PATCH] More remove deprecated methods from powsybl 6

---
 .../powsybl/network/store/iidm/impl/CalculatedBus.java |  5 -----
 .../store/iidm/impl/StaticVarCompensatorAdderImpl.java |  4 ++--
 .../network/store/iidm/impl/CreateNetworksUtil.java    |  4 ++--
 .../network/store/iidm/impl/tck/MergeNetworkTest.java  | 10 ----------
 4 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/network-store-iidm-impl/src/main/java/com/powsybl/network/store/iidm/impl/CalculatedBus.java b/network-store-iidm-impl/src/main/java/com/powsybl/network/store/iidm/impl/CalculatedBus.java
index 1db1bce63..b9f199936 100644
--- a/network-store-iidm-impl/src/main/java/com/powsybl/network/store/iidm/impl/CalculatedBus.java
+++ b/network-store-iidm-impl/src/main/java/com/powsybl/network/store/iidm/impl/CalculatedBus.java
@@ -73,11 +73,6 @@ public String getId() {
         return id;
     }
 
-    @Override
-    public String getName() {
-        return getNameOrId();
-    }
-
     @Override
     public String getNameOrId() {
         return name != null ? name : id;
diff --git a/network-store-iidm-impl/src/main/java/com/powsybl/network/store/iidm/impl/StaticVarCompensatorAdderImpl.java b/network-store-iidm-impl/src/main/java/com/powsybl/network/store/iidm/impl/StaticVarCompensatorAdderImpl.java
index b72f4c878..667947847 100644
--- a/network-store-iidm-impl/src/main/java/com/powsybl/network/store/iidm/impl/StaticVarCompensatorAdderImpl.java
+++ b/network-store-iidm-impl/src/main/java/com/powsybl/network/store/iidm/impl/StaticVarCompensatorAdderImpl.java
@@ -43,13 +43,13 @@ public StaticVarCompensatorAdder setBmax(double bMax) {
     }
 
     @Override
-    public StaticVarCompensatorAdder setVoltageSetPoint(double voltageSetPoint) {
+    public StaticVarCompensatorAdder setVoltageSetpoint(double voltageSetPoint) {
         this.voltageSetPoint = voltageSetPoint;
         return this;
     }
 
     @Override
-    public StaticVarCompensatorAdder setReactivePowerSetPoint(double reactivePowerSetPoint) {
+    public StaticVarCompensatorAdder setReactivePowerSetpoint(double reactivePowerSetPoint) {
         this.reactivePowerSetPoint = reactivePowerSetPoint;
         return this;
     }
diff --git a/network-store-iidm-impl/src/test/java/com/powsybl/network/store/iidm/impl/CreateNetworksUtil.java b/network-store-iidm-impl/src/test/java/com/powsybl/network/store/iidm/impl/CreateNetworksUtil.java
index b3d103a94..a401dbe9e 100644
--- a/network-store-iidm-impl/src/test/java/com/powsybl/network/store/iidm/impl/CreateNetworksUtil.java
+++ b/network-store-iidm-impl/src/test/java/com/powsybl/network/store/iidm/impl/CreateNetworksUtil.java
@@ -249,9 +249,9 @@ private static Network createNetwokWithMultipleEquipments(TopologyKind topologyK
                 .setId("SVC2")
                 .setBmin(0.0002)
                 .setBmax(0.0008)
-                .setReactivePowerSetPoint(200)
+                .setReactivePowerSetpoint(200)
                 .setRegulationMode(StaticVarCompensator.RegulationMode.VOLTAGE)
-                .setVoltageSetPoint(390)
+                .setVoltageSetpoint(390)
                 .add();
         svc.getTerminal().setP(435);
         svc.getTerminal().setQ(315);
diff --git a/network-store-iidm-impl/src/test/java/com/powsybl/network/store/iidm/impl/tck/MergeNetworkTest.java b/network-store-iidm-impl/src/test/java/com/powsybl/network/store/iidm/impl/tck/MergeNetworkTest.java
index 1935d2f56..7e5737752 100644
--- a/network-store-iidm-impl/src/test/java/com/powsybl/network/store/iidm/impl/tck/MergeNetworkTest.java
+++ b/network-store-iidm-impl/src/test/java/com/powsybl/network/store/iidm/impl/tck/MergeNetworkTest.java
@@ -38,21 +38,11 @@ public void multipleDanglingLinesInMergedNetwork() {
         // FIXME
     }
 
-    @Override
-    public void testMergeSameId() {
-        // FIXME
-    }
-
     @Override
     public void test() {
         // FIXME
     }
 
-    @Override
-    public void xnodeNonCompatible() {
-        // FIXME
-    }
-
     @Override
     public void mergeThenCloneVariantBug() {
         // FIXME