diff --git a/src/main/java/org/gridsuite/modification/NetworkModificationException.java b/src/main/java/org/gridsuite/modification/NetworkModificationException.java index 0efea270..f2bdaee1 100644 --- a/src/main/java/org/gridsuite/modification/NetworkModificationException.java +++ b/src/main/java/org/gridsuite/modification/NetworkModificationException.java @@ -1,195 +1,23 @@ /* - Copyright (c) 2021, RTE (http://www.rte-france.com) - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Copyright (c) 2026, RTE (http://www.rte-france.com) + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ package org.gridsuite.modification; import com.powsybl.commons.PowsyblException; -import com.powsybl.iidm.network.IdentifiableType; -import lombok.NonNull; - -import org.gridsuite.modification.dto.OperatingStatusModificationInfos; -import org.springframework.http.HttpStatus; - -import java.util.Objects; - -import static org.gridsuite.modification.NetworkModificationException.Type.ATTRIBUTE_NOT_EDITABLE; /** - * @author Slimane Amar - * @author Franck Lecuyer + * @author Mohamed Benrejeb */ public class NetworkModificationException extends PowsyblException { - public enum Type { - GROOVY_SCRIPT_EMPTY(HttpStatus.BAD_REQUEST, "Empty script"), - GROOVY_SCRIPT_ERROR(HttpStatus.BAD_REQUEST), - NETWORK_NOT_FOUND(HttpStatus.NOT_FOUND), - VARIANT_NOT_FOUND(HttpStatus.NOT_FOUND), - NOTHING_TO_DELETE(HttpStatus.BAD_REQUEST), - MODIFICATION_DELETION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - MODIFICATION_GROUP_NOT_FOUND(HttpStatus.NOT_FOUND), - MODIFICATION_NOT_FOUND(HttpStatus.NOT_FOUND), - SWITCH_NOT_FOUND(HttpStatus.NOT_FOUND), - LINE_NOT_FOUND(HttpStatus.NOT_FOUND), - LOAD_NOT_FOUND(HttpStatus.NOT_FOUND), - BATTERY_NOT_FOUND(HttpStatus.NOT_FOUND), - GENERATOR_NOT_FOUND(HttpStatus.NOT_FOUND), - TWO_WINDINGS_TRANSFORMER_NOT_FOUND(HttpStatus.NOT_FOUND), - UNKNOWN_MODIFICATION_TYPE(HttpStatus.INTERNAL_SERVER_ERROR), - UNKNOWN_EQUIPMENT_TYPE(HttpStatus.INTERNAL_SERVER_ERROR), - WRONG_EQUIPMENT_TYPE(HttpStatus.INTERNAL_SERVER_ERROR), - MODIFICATION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - VOLTAGE_LEVEL_NOT_FOUND(HttpStatus.NOT_FOUND), - CREATE_LOAD_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - MODIFY_LOAD_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - BUSBAR_SECTION_NOT_FOUND(HttpStatus.NOT_FOUND), - BUS_NOT_FOUND(HttpStatus.NOT_FOUND), - CREATE_BATTERY_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - CREATE_GENERATOR_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - CREATE_SHUNT_COMPENSATOR_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - MODIFY_SHUNT_COMPENSATOR_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - CREATE_STATIC_VAR_COMPENSATOR_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - DELETE_EQUIPMENT_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - BY_FILTER_DELETION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - EQUIPMENT_NOT_FOUND(HttpStatus.NOT_FOUND), - ATTRIBUTE_NOT_EDITABLE(HttpStatus.BAD_REQUEST), - CREATE_LINE_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - MODIFY_LINE_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - CREATE_TWO_WINDINGS_TRANSFORMER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - MODIFY_TWO_WINDINGS_TRANSFORMER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - CREATE_SUBSTATION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - MODIFY_SUBSTATION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - CREATE_VOLTAGE_LEVEL_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - MODIFY_VOLTAGE_LEVEL_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - SUBSTATION_NOT_FOUND(HttpStatus.NOT_FOUND), - BATTERY_ALREADY_EXISTS(HttpStatus.BAD_REQUEST), - LOAD_ALREADY_EXISTS(HttpStatus.BAD_REQUEST), - VOLTAGE_LEVEL_ALREADY_EXISTS(HttpStatus.BAD_REQUEST), - BUSBAR_SECTION_ALREADY_EXISTS(HttpStatus.BAD_REQUEST), - BUSBAR_SECTION_NOT_DEFINED(HttpStatus.BAD_REQUEST), - GENERATOR_ALREADY_EXISTS(HttpStatus.BAD_REQUEST), - SHUNT_COMPENSATOR_ALREADY_EXISTS(HttpStatus.BAD_REQUEST), - SHUNT_COMPENSATOR_NOT_FOUND(HttpStatus.NOT_FOUND), - STATIC_VAR_COMPENSATOR_ALREADY_EXISTS(HttpStatus.BAD_REQUEST), - STATIC_VAR_COMPENSATOR_NOT_FOUND(HttpStatus.NOT_FOUND), - LINE_ALREADY_EXISTS(HttpStatus.BAD_REQUEST), - TWO_WINDINGS_TRANSFORMER_ALREADY_EXISTS(HttpStatus.BAD_REQUEST), - TWO_WINDINGS_TRANSFORMER_CREATION_ERROR(HttpStatus.BAD_REQUEST), - BRANCH_MODIFICATION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - INJECTION_MODIFICATION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - MODIFY_BATTERY_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - OPERATING_STATUS_MODIFICATION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - OPERATING_ACTION_TYPE_EMPTY(HttpStatus.BAD_REQUEST, "Empty operating action type"), - OPERATING_ACTION_TYPE_UNKNOWN(HttpStatus.BAD_REQUEST), - OPERATING_ACTION_TYPE_UNSUPPORTED(HttpStatus.INTERNAL_SERVER_ERROR), - EQUIPMENT_TYPE_UNSUPPORTED(HttpStatus.INTERNAL_SERVER_ERROR), - LINE_SPLIT_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - LINE_SPLIT_NOT_FOUND(HttpStatus.NOT_FOUND), - LINE_ATTACH_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - LINE_ATTACH_DESCRIPTION_ERROR(HttpStatus.BAD_REQUEST), - LINE_ATTACH_NOT_FOUND(HttpStatus.NOT_FOUND), - MODIFY_GENERATOR_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - TYPE_MISMATCH(HttpStatus.BAD_REQUEST), - MISSING_MODIFICATION_DESCRIPTION(HttpStatus.BAD_REQUEST), - MODIFICATION_OUT_OF_RANGE(HttpStatus.BAD_REQUEST), - DELETE_VOLTAGE_LEVEL_ON_LINE_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - DELETE_VOLTAGE_LEVEL_ON_LINE_NOT_FOUND(HttpStatus.NOT_FOUND), - EQUIPMENT_ATTRIBUTE_NAME_ERROR(HttpStatus.BAD_REQUEST), - EQUIPMENT_ATTRIBUTE_VALUE_ERROR(HttpStatus.BAD_REQUEST), - MOVE_MODIFICATION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - GENERATOR_SCALING_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - LOAD_SCALING_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - DELETE_ATTACHING_LINE_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - DELETE_ATTACHING_LINE_NOT_FOUND(HttpStatus.NOT_FOUND), - FILTERS_NOT_FOUND(HttpStatus.NOT_FOUND), - LOAD_FLOW_PARAMETERS_NOT_FOUND(HttpStatus.NOT_FOUND), - LOAD_FLOW_PARAMETERS_FETCH_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - GENERATION_DISPATCH_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - BALANCES_ADJUSTMENT_MODIFICATION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - VOLTAGE_INIT_MODIFICATION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - TABULAR_MODIFICATION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - TABULAR_CREATION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - CREATE_VSC_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - MODIFY_VSC_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - CREATE_LCC_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - MODIFY_LCC_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - HVDC_LINE_ALREADY_EXISTS(HttpStatus.BAD_REQUEST), - VSC_CONVERTER_STATION_NOT_FOUND(HttpStatus.NOT_FOUND), - LCC_CONVERTER_STATION_NOT_FOUND(HttpStatus.NOT_FOUND), - CREATE_CONVERTER_STATION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - MODIFY_CONVERTER_STATION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - LCC_CREATE_CONVERTER_STATION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - LCC_MODIFY_CONVERTER_STATION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - BY_FORMULA_MODIFICATION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - MODIFICATION_BY_ASSIGNMENT_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - HVDC_LINE_NOT_FOUND(HttpStatus.NOT_FOUND), - COMPOSITE_MODIFICATION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - WRONG_HVDC_ANGLE_DROOP_ACTIVE_POWER_CONTROL(HttpStatus.BAD_REQUEST), - UNSUPPORTED_HYBRID_HVDC(HttpStatus.INTERNAL_SERVER_ERROR), - MODIFY_VOLTAGE_LEVEL_TOPOLOGY_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - CREATE_COUPLING_DEVICE_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - CREATE_VOLTAGE_LEVEL_TOPOLOGY_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - CREATE_VOLTAGE_LEVEL_SECTION_ERROR(HttpStatus.INTERNAL_SERVER_ERROR), - MOVE_VOLTAGE_LEVEL_FEEDER_BAYS_ERROR(HttpStatus.INTERNAL_SERVER_ERROR),; - - public final HttpStatus status; - private final String message; - - HttpStatus getStatus() { - return status; - } - - Type(HttpStatus status) { - this(status, null); - } - - Type(HttpStatus status, String message) { - this.status = status; - this.message = message; - } - } - - private final Type type; - - public NetworkModificationException(Type type) { - super(Objects.requireNonNull(type.name()) + ((type.message == null) ? "" : " : " + type.message)); - this.type = type; - } - - public NetworkModificationException(Type type, Exception cause) { - super(Objects.requireNonNull(type.name()) + " : " + ((cause.getMessage() == null) ? cause.getClass().getName() : cause.getMessage()), cause); - this.type = type; - } - - public NetworkModificationException(Type type, String message) { - super(Objects.requireNonNull(type.name()) + " : " + Objects.requireNonNull(message)); - this.type = type; - } - - public Type getType() { - return type; - } - - public static NetworkModificationException createEquipmentTypeUnknown(@NonNull String type) { - return new NetworkModificationException(Type.UNKNOWN_EQUIPMENT_TYPE, "The equipment type : " + type + " is unknown"); - } - - public static NetworkModificationException createEquipmentTypeNotSupported(@NonNull String type) { - return new NetworkModificationException(Type.EQUIPMENT_TYPE_UNSUPPORTED, "The equipment type : " + type + " is not supported"); - } - - public static NetworkModificationException createOperatingActionTypeUnsupported(@NonNull OperatingStatusModificationInfos.ActionType type) { - return new NetworkModificationException(Type.OPERATING_ACTION_TYPE_UNSUPPORTED, "The operating action type : " + type + " is unsupported"); - } - public static NetworkModificationException createEquipementAttributeNotEditable(@NonNull IdentifiableType equipmentType, @NonNull String attributeName) { - throw new NetworkModificationException(ATTRIBUTE_NOT_EDITABLE, equipmentType.name() + " attribute '" + attributeName + "' not editable"); + public NetworkModificationException(String message) { + super(message); } - public static NetworkModificationException createHybridHvdcUnsupported(String hvdcId) { - Objects.requireNonNull(hvdcId); - return new NetworkModificationException(Type.UNSUPPORTED_HYBRID_HVDC, String.format("The hybrid Hvdc line %s is unsupported", hvdcId)); + public NetworkModificationException(String message, Throwable cause) { + super(message, cause); } } diff --git a/src/main/java/org/gridsuite/modification/dto/BalancesAdjustmentModificationInfos.java b/src/main/java/org/gridsuite/modification/dto/BalancesAdjustmentModificationInfos.java index 398a64fe..1e813f0f 100644 --- a/src/main/java/org/gridsuite/modification/dto/BalancesAdjustmentModificationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/BalancesAdjustmentModificationInfos.java @@ -13,7 +13,6 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.BalancesAdjustmentModification; @@ -31,7 +30,6 @@ @ToString(callSuper = true) @Schema(description = "Balances adjustment modification infos") @JsonTypeName("BALANCES_ADJUSTMENT_MODIFICATION") -@ModificationErrorTypeName("BALANCES_ADJUSTMENT_MODIFICATION_ERROR") public class BalancesAdjustmentModificationInfos extends ModificationInfos { public static final int DEFAULT_MAX_NUMBER_ITERATIONS = 5; public static final double DEFAULT_THRESHOLD_NET_POSITION = 1; diff --git a/src/main/java/org/gridsuite/modification/dto/BatteryCreationInfos.java b/src/main/java/org/gridsuite/modification/dto/BatteryCreationInfos.java index 90251466..9ed80887 100644 --- a/src/main/java/org/gridsuite/modification/dto/BatteryCreationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/BatteryCreationInfos.java @@ -14,7 +14,6 @@ import lombok.Setter; import lombok.ToString; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.BatteryCreation; @@ -31,7 +30,6 @@ @ToString(callSuper = true) @Schema(description = "Battery creation") @JsonTypeName("BATTERY_CREATION") -@ModificationErrorTypeName("CREATE_BATTERY_ERROR") public class BatteryCreationInfos extends InjectionCreationInfos implements ReactiveLimitsHolderInfos { @Schema(description = "Minimum active power") diff --git a/src/main/java/org/gridsuite/modification/dto/BatteryModificationInfos.java b/src/main/java/org/gridsuite/modification/dto/BatteryModificationInfos.java index 85bee65e..3744ec91 100644 --- a/src/main/java/org/gridsuite/modification/dto/BatteryModificationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/BatteryModificationInfos.java @@ -9,7 +9,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.powsybl.commons.report.ReportNode; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.BatteryModification; @@ -31,7 +30,6 @@ @ToString(callSuper = true) @Schema(description = "Battery modification") @JsonTypeName("BATTERY_MODIFICATION") -@ModificationErrorTypeName("MODIFY_BATTERY_ERROR") public class BatteryModificationInfos extends InjectionModificationInfos { @Schema(description = "Minimum active power") private AttributeModification minP; diff --git a/src/main/java/org/gridsuite/modification/dto/ByFilterDeletionInfos.java b/src/main/java/org/gridsuite/modification/dto/ByFilterDeletionInfos.java index 3ef524f7..b4b46e60 100644 --- a/src/main/java/org/gridsuite/modification/dto/ByFilterDeletionInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/ByFilterDeletionInfos.java @@ -16,7 +16,6 @@ import lombok.Setter; import lombok.ToString; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.ByFilterDeletion; @@ -34,7 +33,6 @@ @ToString(callSuper = true) @Schema(description = "By filter deletion") @JsonTypeName("BY_FILTER_DELETION") -@ModificationErrorTypeName("BY_FILTER_DELETION_ERROR") public class ByFilterDeletionInfos extends ModificationInfos { @Schema(description = "Equipment type") private IdentifiableType equipmentType; diff --git a/src/main/java/org/gridsuite/modification/dto/ByFormulaModificationInfos.java b/src/main/java/org/gridsuite/modification/dto/ByFormulaModificationInfos.java index 268008bd..9cc46caf 100644 --- a/src/main/java/org/gridsuite/modification/dto/ByFormulaModificationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/ByFormulaModificationInfos.java @@ -17,7 +17,6 @@ import lombok.Setter; import lombok.ToString; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.dto.byfilter.formula.FormulaInfos; import org.gridsuite.modification.modifications.byfilter.ByFormulaModification; @@ -33,7 +32,6 @@ @Getter @Setter @JsonTypeName("BY_FORMULA_MODIFICATION") -@ModificationErrorTypeName("BY_FORMULA_MODIFICATION_ERROR") @ToString(callSuper = true) @Schema(description = "Modification by formula") public class ByFormulaModificationInfos extends ModificationInfos { diff --git a/src/main/java/org/gridsuite/modification/dto/CompositeModificationInfos.java b/src/main/java/org/gridsuite/modification/dto/CompositeModificationInfos.java index 96ea4838..7d14fcb3 100644 --- a/src/main/java/org/gridsuite/modification/dto/CompositeModificationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/CompositeModificationInfos.java @@ -14,7 +14,6 @@ import lombok.Setter; import lombok.ToString; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.CompositeModification; @@ -30,7 +29,6 @@ @ToString(callSuper = true) @Schema(description = "Composite modification") @JsonTypeName("COMPOSITE_MODIFICATION") -@ModificationErrorTypeName("COMPOSITE_MODIFICATION_ERROR") public class CompositeModificationInfos extends ModificationInfos { @Schema(description = "composite modification list") diff --git a/src/main/java/org/gridsuite/modification/dto/ConverterStationCreationInfos.java b/src/main/java/org/gridsuite/modification/dto/ConverterStationCreationInfos.java index 06cadb9f..1ce508ab 100644 --- a/src/main/java/org/gridsuite/modification/dto/ConverterStationCreationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/ConverterStationCreationInfos.java @@ -14,7 +14,6 @@ import lombok.Setter; import lombok.ToString; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import java.util.List; @@ -29,7 +28,6 @@ @ToString(callSuper = true) @Schema(description = "Converter station creation") @JsonTypeName("CONVERTER_STATION_CREATION") -@ModificationErrorTypeName("CREATE_CONVERTER_STATION_ERROR") public class ConverterStationCreationInfos extends InjectionCreationInfos implements ReactiveLimitsHolderInfos { @Schema(description = "Loss Factor") private Float lossFactor; diff --git a/src/main/java/org/gridsuite/modification/dto/ConverterStationModificationInfos.java b/src/main/java/org/gridsuite/modification/dto/ConverterStationModificationInfos.java index 784d5555..4a9da68b 100644 --- a/src/main/java/org/gridsuite/modification/dto/ConverterStationModificationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/ConverterStationModificationInfos.java @@ -14,8 +14,6 @@ import lombok.ToString; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; - import java.util.List; /** @@ -28,7 +26,6 @@ @ToString(callSuper = true) @Schema(description = "Converter station modification") @JsonTypeName("CONVERTER_STATION_MODIFICATION") -@ModificationErrorTypeName("MODIFY_CONVERTER_STATION_ERROR") public class ConverterStationModificationInfos extends InjectionModificationInfos { @Schema(description = "Loss Factor") private AttributeModification lossFactor; diff --git a/src/main/java/org/gridsuite/modification/dto/CreateCouplingDeviceInfos.java b/src/main/java/org/gridsuite/modification/dto/CreateCouplingDeviceInfos.java index 5a30e2b2..bd2d14fb 100644 --- a/src/main/java/org/gridsuite/modification/dto/CreateCouplingDeviceInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/CreateCouplingDeviceInfos.java @@ -14,7 +14,6 @@ import lombok.Setter; import lombok.ToString; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.CreateCouplingDevice; @@ -31,7 +30,6 @@ @ToString(callSuper = true) @Schema(description = "Coupling device creation") @JsonTypeName("CREATE_COUPLING_DEVICE") -@ModificationErrorTypeName("CREATE_COUPLING_DEVICE_ERROR") public class CreateCouplingDeviceInfos extends ModificationInfos { @Schema(description = "VoltageLevelId") diff --git a/src/main/java/org/gridsuite/modification/dto/CreateVoltageLevelSectionInfos.java b/src/main/java/org/gridsuite/modification/dto/CreateVoltageLevelSectionInfos.java index 4d7779b3..dc6ec453 100644 --- a/src/main/java/org/gridsuite/modification/dto/CreateVoltageLevelSectionInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/CreateVoltageLevelSectionInfos.java @@ -14,7 +14,6 @@ import lombok.Setter; import lombok.ToString; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.CreateVoltageLevelSection; @@ -31,7 +30,6 @@ @ToString(callSuper = true) @Schema(description = "Create Voltage Level Section") @JsonTypeName("CREATE_VOLTAGE_LEVEL_SECTION") -@ModificationErrorTypeName("CREATE_VOLTAGE_LEVEL_SECTION_ERROR") public class CreateVoltageLevelSectionInfos extends ModificationInfos { @Schema(description = "VoltageLevelId") private String voltageLevelId; diff --git a/src/main/java/org/gridsuite/modification/dto/DeleteAttachingLineInfos.java b/src/main/java/org/gridsuite/modification/dto/DeleteAttachingLineInfos.java index f797cdbc..e0ef5d21 100644 --- a/src/main/java/org/gridsuite/modification/dto/DeleteAttachingLineInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/DeleteAttachingLineInfos.java @@ -15,7 +15,6 @@ import lombok.Setter; import lombok.ToString; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.DeleteAttachingLine; @@ -33,7 +32,6 @@ @ToString(callSuper = true) @Schema(description = "Delete attaching line infos") @JsonTypeName("DELETE_ATTACHING_LINE") -@ModificationErrorTypeName("DELETE_ATTACHING_LINE_ERROR") public class DeleteAttachingLineInfos extends ModificationInfos { @Schema(description = "line 1 id") diff --git a/src/main/java/org/gridsuite/modification/dto/DeleteVoltageLevelOnLineInfos.java b/src/main/java/org/gridsuite/modification/dto/DeleteVoltageLevelOnLineInfos.java index bfeb5e5a..20d521b2 100644 --- a/src/main/java/org/gridsuite/modification/dto/DeleteVoltageLevelOnLineInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/DeleteVoltageLevelOnLineInfos.java @@ -11,7 +11,6 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.DeleteVoltageLevelOnLine; @@ -30,7 +29,6 @@ @ToString(callSuper = true) @Schema(description = "Delete voltage level on line infos") @JsonTypeName("DELETE_VOLTAGE_LEVEL_ON_LINE") -@ModificationErrorTypeName("DELETE_VOLTAGE_LEVEL_ON_LINE_ERROR") public class DeleteVoltageLevelOnLineInfos extends ModificationInfos { @Schema(description = "line 1 id") diff --git a/src/main/java/org/gridsuite/modification/dto/EquipmentAttributeModificationInfos.java b/src/main/java/org/gridsuite/modification/dto/EquipmentAttributeModificationInfos.java index 67dcbc65..f3865388 100644 --- a/src/main/java/org/gridsuite/modification/dto/EquipmentAttributeModificationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/EquipmentAttributeModificationInfos.java @@ -17,7 +17,6 @@ import lombok.experimental.SuperBuilder; import org.gridsuite.modification.NetworkModificationException; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.EquipmentAttributeModification; import org.springframework.lang.NonNull; @@ -26,8 +25,6 @@ import java.util.Map; import java.util.Set; -import static org.gridsuite.modification.NetworkModificationException.Type.*; - /** * @author Franck Lecuyer */ @@ -38,7 +35,6 @@ @ToString(callSuper = true) @Schema(description = "Equipment attribute modification") @JsonTypeName("EQUIPMENT_ATTRIBUTE_MODIFICATION") -@ModificationErrorTypeName("MODIFICATION_ERROR") public class EquipmentAttributeModificationInfos extends EquipmentModificationInfos { @Schema(description = "Equipment attribute name") private String equipmentAttributeName; @@ -85,11 +81,11 @@ public Map getMapMessageValues() { private void checkSwitchStatusModificationInfos() { if (!equipmentAttributeName.equals("open")) { - throw new NetworkModificationException(EQUIPMENT_ATTRIBUTE_NAME_ERROR, "For switch status, the attribute name is only 'open'"); + throw new NetworkModificationException("For switch status, the attribute name is only 'open'"); } Set possibleValues = Set.of(true, false); if (!possibleValues.contains(equipmentAttributeValue)) { - throw new NetworkModificationException(EQUIPMENT_ATTRIBUTE_VALUE_ERROR, "For switch status, the attribute values are only " + possibleValues); + throw new NetworkModificationException("For switch status, the attribute values are only " + possibleValues); } } } diff --git a/src/main/java/org/gridsuite/modification/dto/EquipmentDeletionInfos.java b/src/main/java/org/gridsuite/modification/dto/EquipmentDeletionInfos.java index 1d009a5b..1b4e170a 100644 --- a/src/main/java/org/gridsuite/modification/dto/EquipmentDeletionInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/EquipmentDeletionInfos.java @@ -17,7 +17,6 @@ import lombok.ToString; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.EquipmentDeletion; @@ -31,7 +30,6 @@ @ToString(callSuper = true) @Schema(description = "Equipment deletion") @JsonTypeName("EQUIPMENT_DELETION") -@ModificationErrorTypeName("DELETE_EQUIPMENT_ERROR") public class EquipmentDeletionInfos extends EquipmentModificationInfos { @Schema(description = "Equipment type") private IdentifiableType equipmentType; diff --git a/src/main/java/org/gridsuite/modification/dto/GenerationDispatchInfos.java b/src/main/java/org/gridsuite/modification/dto/GenerationDispatchInfos.java index 36e1f3c4..9fcceca5 100644 --- a/src/main/java/org/gridsuite/modification/dto/GenerationDispatchInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/GenerationDispatchInfos.java @@ -14,7 +14,6 @@ import lombok.NoArgsConstructor; import lombok.Setter; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.GenerationDispatch; @@ -29,7 +28,6 @@ @Setter @Schema(description = "Generation dispatch creation") @JsonTypeName("GENERATION_DISPATCH") -@ModificationErrorTypeName("GENERATION_DISPATCH_ERROR") public class GenerationDispatchInfos extends ModificationInfos { @Schema(description = "loss coefficient") private Double lossCoefficient; diff --git a/src/main/java/org/gridsuite/modification/dto/GeneratorCreationInfos.java b/src/main/java/org/gridsuite/modification/dto/GeneratorCreationInfos.java index c3e4b947..006589a9 100644 --- a/src/main/java/org/gridsuite/modification/dto/GeneratorCreationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/GeneratorCreationInfos.java @@ -17,7 +17,6 @@ import lombok.ToString; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.GeneratorCreation; @@ -34,7 +33,6 @@ @ToString(callSuper = true) @Schema(description = "Generator creation") @JsonTypeName("GENERATOR_CREATION") -@ModificationErrorTypeName("CREATE_GENERATOR_ERROR") public class GeneratorCreationInfos extends InjectionCreationInfos implements ReactiveLimitsHolderInfos { @Schema(description = "Energy source") private EnergySource energySource; diff --git a/src/main/java/org/gridsuite/modification/dto/GeneratorModificationInfos.java b/src/main/java/org/gridsuite/modification/dto/GeneratorModificationInfos.java index 821c445c..67286cc9 100644 --- a/src/main/java/org/gridsuite/modification/dto/GeneratorModificationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/GeneratorModificationInfos.java @@ -11,7 +11,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.powsybl.commons.report.ReportNode; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.GeneratorModification; @@ -33,7 +32,6 @@ @ToString(callSuper = true) @Schema(description = "generator modification") @JsonTypeName("GENERATOR_MODIFICATION") -@ModificationErrorTypeName("MODIFY_GENERATOR_ERROR") public class GeneratorModificationInfos extends InjectionModificationInfos { @Schema(description = "Energy source") private AttributeModification energySource; diff --git a/src/main/java/org/gridsuite/modification/dto/GeneratorScalingInfos.java b/src/main/java/org/gridsuite/modification/dto/GeneratorScalingInfos.java index f37e6acd..3ffc9512 100644 --- a/src/main/java/org/gridsuite/modification/dto/GeneratorScalingInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/GeneratorScalingInfos.java @@ -14,7 +14,6 @@ import lombok.NoArgsConstructor; import lombok.Setter; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.GeneratorScaling; @@ -27,7 +26,6 @@ @Getter @Setter @JsonTypeName("GENERATOR_SCALING") -@ModificationErrorTypeName("GENERATOR_SCALING_ERROR") @Schema(description = "Generator scaling creation") public class GeneratorScalingInfos extends ScalingInfos { diff --git a/src/main/java/org/gridsuite/modification/dto/GroovyScriptInfos.java b/src/main/java/org/gridsuite/modification/dto/GroovyScriptInfos.java index bd15c87b..9a22c4fc 100644 --- a/src/main/java/org/gridsuite/modification/dto/GroovyScriptInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/GroovyScriptInfos.java @@ -8,7 +8,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.powsybl.commons.report.ReportNode; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.GroovyScript; import io.swagger.v3.oas.annotations.media.Schema; @@ -28,7 +27,6 @@ @ToString(callSuper = true) @Schema(description = "Groovy script modification") @JsonTypeName("GROOVY_SCRIPT") -@ModificationErrorTypeName("GROOVY_SCRIPT_ERROR") public class GroovyScriptInfos extends ModificationInfos { @Schema(description = "Groovy script") private String script; diff --git a/src/main/java/org/gridsuite/modification/dto/LccConverterStationCreationInfos.java b/src/main/java/org/gridsuite/modification/dto/LccConverterStationCreationInfos.java index c5fb532f..7afaae86 100644 --- a/src/main/java/org/gridsuite/modification/dto/LccConverterStationCreationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/LccConverterStationCreationInfos.java @@ -12,7 +12,6 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import java.util.List; @@ -27,7 +26,6 @@ @ToString(callSuper = true) @Schema(description = "Lcc converter station creation") @JsonTypeName("LCC_CONVERTER_STATION_CREATION") -@ModificationErrorTypeName("LCC_CREATE_CONVERTER_STATION_ERROR") public class LccConverterStationCreationInfos extends InjectionCreationInfos { @Schema(description = "Loss Factor") private Float lossFactor; diff --git a/src/main/java/org/gridsuite/modification/dto/LccConverterStationModificationInfos.java b/src/main/java/org/gridsuite/modification/dto/LccConverterStationModificationInfos.java index ab2cde66..96daefcc 100644 --- a/src/main/java/org/gridsuite/modification/dto/LccConverterStationModificationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/LccConverterStationModificationInfos.java @@ -12,7 +12,6 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.springframework.util.CollectionUtils; import java.util.List; @@ -24,7 +23,6 @@ @ToString(callSuper = true) @Schema(description = "Lcc converter station modification") @JsonTypeName("LCC_CONVERTER_STATION_MODIFICATION") -@ModificationErrorTypeName("LCC_MODIFY_CONVERTER_STATION_ERROR") public class LccConverterStationModificationInfos extends InjectionModificationInfos { @Schema(description = "Loss Factor") private AttributeModification lossFactor; diff --git a/src/main/java/org/gridsuite/modification/dto/LccCreationInfos.java b/src/main/java/org/gridsuite/modification/dto/LccCreationInfos.java index 8c841084..4173e9d8 100644 --- a/src/main/java/org/gridsuite/modification/dto/LccCreationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/LccCreationInfos.java @@ -16,7 +16,6 @@ import lombok.Setter; import lombok.ToString; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.LccCreation; @@ -31,7 +30,6 @@ @ToString(callSuper = true) @Schema(description = "LCC creation") @JsonTypeName("LCC_CREATION") -@ModificationErrorTypeName("CREATE_LCC_ERROR") public class LccCreationInfos extends EquipmentCreationInfos { @Schema(description = "DC nominal voltage") private Double nominalV; diff --git a/src/main/java/org/gridsuite/modification/dto/LccModificationInfos.java b/src/main/java/org/gridsuite/modification/dto/LccModificationInfos.java index a5c82f19..0eea9a8f 100644 --- a/src/main/java/org/gridsuite/modification/dto/LccModificationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/LccModificationInfos.java @@ -16,7 +16,6 @@ import lombok.Setter; import lombok.ToString; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.LccModification; @@ -27,7 +26,6 @@ @ToString(callSuper = true) @Schema(description = "LCC modification") @JsonTypeName("LCC_MODIFICATION") -@ModificationErrorTypeName("MODIFY_LCC_ERROR") public class LccModificationInfos extends BasicEquipmentModificationInfos { @Schema(description = "DC nominal voltage") private AttributeModification nominalV; diff --git a/src/main/java/org/gridsuite/modification/dto/LineAttachToVoltageLevelInfos.java b/src/main/java/org/gridsuite/modification/dto/LineAttachToVoltageLevelInfos.java index 99b03ff2..ece5638f 100644 --- a/src/main/java/org/gridsuite/modification/dto/LineAttachToVoltageLevelInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/LineAttachToVoltageLevelInfos.java @@ -11,7 +11,6 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.LineAttachToVoltageLevel; import java.util.Map; @@ -27,7 +26,6 @@ @ToString(callSuper = true) @Schema(description = "Line attach to voltage level") @JsonTypeName("LINE_ATTACH_TO_VOLTAGE_LEVEL") -@ModificationErrorTypeName("LINE_ATTACH_ERROR") public class LineAttachToVoltageLevelInfos extends ModificationInfos { @Schema(description = "line to attach to ID") diff --git a/src/main/java/org/gridsuite/modification/dto/LineCreationInfos.java b/src/main/java/org/gridsuite/modification/dto/LineCreationInfos.java index ab52f19c..d90be833 100644 --- a/src/main/java/org/gridsuite/modification/dto/LineCreationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/LineCreationInfos.java @@ -15,7 +15,6 @@ import lombok.ToString; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.LineCreation; @@ -30,7 +29,6 @@ @ToString(callSuper = true) @Schema(description = "Line creation") @JsonTypeName("LINE_CREATION") -@ModificationErrorTypeName("CREATE_LINE_ERROR") public class LineCreationInfos extends BranchCreationInfos { @Schema(description = "Shunt conductance Side 1") diff --git a/src/main/java/org/gridsuite/modification/dto/LineModificationInfos.java b/src/main/java/org/gridsuite/modification/dto/LineModificationInfos.java index 10f3a9d5..38ba5f20 100644 --- a/src/main/java/org/gridsuite/modification/dto/LineModificationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/LineModificationInfos.java @@ -15,7 +15,6 @@ import lombok.ToString; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.LineModification; @@ -30,7 +29,6 @@ @ToString(callSuper = true) @Schema(description = "Line modification") @JsonTypeName("LINE_MODIFICATION") -@ModificationErrorTypeName("MODIFY_LINE_ERROR") public class LineModificationInfos extends BranchModificationInfos { @Schema(description = "Shunt conductance Side 1") diff --git a/src/main/java/org/gridsuite/modification/dto/LineSplitWithVoltageLevelInfos.java b/src/main/java/org/gridsuite/modification/dto/LineSplitWithVoltageLevelInfos.java index 1eeadb25..e0fec749 100644 --- a/src/main/java/org/gridsuite/modification/dto/LineSplitWithVoltageLevelInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/LineSplitWithVoltageLevelInfos.java @@ -12,7 +12,6 @@ import lombok.*; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.LineSplitWithVoltageLevel; @@ -29,7 +28,6 @@ @ToString(callSuper = true) @Schema(description = "Line split with voltage level") @JsonTypeName("LINE_SPLIT_WITH_VOLTAGE_LEVEL") -@ModificationErrorTypeName("LINE_SPLIT_ERROR") public class LineSplitWithVoltageLevelInfos extends ModificationInfos { @Schema(description = "line to split ID") diff --git a/src/main/java/org/gridsuite/modification/dto/LinesAttachToSplitLinesInfos.java b/src/main/java/org/gridsuite/modification/dto/LinesAttachToSplitLinesInfos.java index 0605cfb6..e5c2b5a8 100644 --- a/src/main/java/org/gridsuite/modification/dto/LinesAttachToSplitLinesInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/LinesAttachToSplitLinesInfos.java @@ -11,7 +11,6 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.LinesAttachToSplitLines; import java.util.Map; @@ -28,7 +27,6 @@ @ToString(callSuper = true) @Schema(description = "Line attach to split line") @JsonTypeName("LINES_ATTACH_TO_SPLIT_LINES") -@ModificationErrorTypeName("LINE_ATTACH_ERROR") public class LinesAttachToSplitLinesInfos extends ModificationInfos { @Schema(description = "line 1 id") diff --git a/src/main/java/org/gridsuite/modification/dto/LoadCreationInfos.java b/src/main/java/org/gridsuite/modification/dto/LoadCreationInfos.java index 87bc1d63..61fb4d54 100644 --- a/src/main/java/org/gridsuite/modification/dto/LoadCreationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/LoadCreationInfos.java @@ -15,7 +15,6 @@ import lombok.Setter; import lombok.ToString; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.LoadCreation; @@ -30,7 +29,6 @@ @ToString(callSuper = true) @Schema(description = "Load creation") @JsonTypeName("LOAD_CREATION") -@ModificationErrorTypeName("CREATE_LOAD_ERROR") public class LoadCreationInfos extends InjectionCreationInfos { @Schema(description = "Load type") private LoadType loadType; diff --git a/src/main/java/org/gridsuite/modification/dto/LoadModificationInfos.java b/src/main/java/org/gridsuite/modification/dto/LoadModificationInfos.java index 59e930da..0f1df45c 100644 --- a/src/main/java/org/gridsuite/modification/dto/LoadModificationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/LoadModificationInfos.java @@ -9,7 +9,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.powsybl.commons.report.ReportNode; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.LoadModification; import com.fasterxml.jackson.annotation.JsonInclude; @@ -29,7 +28,6 @@ @JsonInclude(JsonInclude.Include.NON_NULL) @Schema(description = "Load modification") @JsonTypeName("LOAD_MODIFICATION") -@ModificationErrorTypeName("MODIFY_LOAD_ERROR") public class LoadModificationInfos extends InjectionModificationInfos { @Schema(description = "Load type modification") private AttributeModification loadType; diff --git a/src/main/java/org/gridsuite/modification/dto/LoadScalingInfos.java b/src/main/java/org/gridsuite/modification/dto/LoadScalingInfos.java index 3b178bee..3b270d2f 100644 --- a/src/main/java/org/gridsuite/modification/dto/LoadScalingInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/LoadScalingInfos.java @@ -14,7 +14,6 @@ import lombok.Setter; import lombok.ToString; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.LoadScaling; @@ -28,7 +27,6 @@ @ToString(callSuper = true) @Schema(description = "Load scaling creation") @JsonTypeName("LOAD_SCALING") -@ModificationErrorTypeName("LOAD_SCALING_ERROR") public class LoadScalingInfos extends ScalingInfos { @Override diff --git a/src/main/java/org/gridsuite/modification/dto/ModificationByAssignmentInfos.java b/src/main/java/org/gridsuite/modification/dto/ModificationByAssignmentInfos.java index a77d74e8..6e48885e 100644 --- a/src/main/java/org/gridsuite/modification/dto/ModificationByAssignmentInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/ModificationByAssignmentInfos.java @@ -16,7 +16,6 @@ import lombok.Setter; import lombok.ToString; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.dto.byfilter.assignment.AssignmentInfos; import org.gridsuite.modification.modifications.byfilter.ModificationByAssignment; @@ -30,7 +29,6 @@ @Getter @Setter @JsonTypeName("MODIFICATION_BY_ASSIGNMENT") -@ModificationErrorTypeName("MODIFICATION_BY_ASSIGNMENT_ERROR") @ToString(callSuper = true) @Schema(description = "Modification by assignment") public class ModificationByAssignmentInfos extends ModificationInfos { diff --git a/src/main/java/org/gridsuite/modification/dto/ModificationInfos.java b/src/main/java/org/gridsuite/modification/dto/ModificationInfos.java index 840a4aa6..976cc8bb 100644 --- a/src/main/java/org/gridsuite/modification/dto/ModificationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/ModificationInfos.java @@ -15,8 +15,6 @@ import lombok.*; import lombok.experimental.SuperBuilder; import org.gridsuite.modification.ModificationType; -import org.gridsuite.modification.NetworkModificationException; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.dto.tabular.LimitSetsTabularModificationInfos; import org.gridsuite.modification.dto.tabular.TabularCreationInfos; import org.gridsuite.modification.dto.tabular.TabularModificationInfos; @@ -132,11 +130,6 @@ public AbstractModification toModification() { throw new UnsupportedOperationException("Method toModification must be implemented in subclass " + this.getClass().getSimpleName()); } - @JsonIgnore - public final NetworkModificationException.Type getErrorType() { - return NetworkModificationException.Type.valueOf(this.getClass().getAnnotation(ModificationErrorTypeName.class).value()); - } - public final ModificationType getType() { return type.get() != null ? type.get() : ModificationType.valueOf(this.getClass().getAnnotation(JsonTypeName.class).value()); } diff --git a/src/main/java/org/gridsuite/modification/dto/MoveVoltageLevelFeederBaysInfos.java b/src/main/java/org/gridsuite/modification/dto/MoveVoltageLevelFeederBaysInfos.java index 21f48dc1..e563f6a0 100644 --- a/src/main/java/org/gridsuite/modification/dto/MoveVoltageLevelFeederBaysInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/MoveVoltageLevelFeederBaysInfos.java @@ -13,7 +13,6 @@ import lombok.NoArgsConstructor; import lombok.Setter; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.MoveVoltageLevelFeederBays; @@ -29,7 +28,6 @@ @Setter @Schema(description = "Move voltage level feeder bays") @JsonTypeName("MOVE_VOLTAGE_LEVEL_FEEDER_BAYS") -@ModificationErrorTypeName("MOVE_VOLTAGE_LEVEL_FEEDER_BAYS_ERROR") public class MoveVoltageLevelFeederBaysInfos extends ModificationInfos { @Schema(description = "Voltage level id") diff --git a/src/main/java/org/gridsuite/modification/dto/OperatingStatusModificationInfos.java b/src/main/java/org/gridsuite/modification/dto/OperatingStatusModificationInfos.java index b09f33d3..5d97e931 100644 --- a/src/main/java/org/gridsuite/modification/dto/OperatingStatusModificationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/OperatingStatusModificationInfos.java @@ -15,14 +15,11 @@ import lombok.ToString; import lombok.experimental.SuperBuilder; import org.gridsuite.modification.NetworkModificationException; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.OperatingStatusModification; import java.util.HashMap; import java.util.Map; -import static org.gridsuite.modification.NetworkModificationException.Type.OPERATING_ACTION_TYPE_EMPTY; - /** * @author Slimane Amar */ @@ -33,7 +30,6 @@ @ToString(callSuper = true) @Schema(description = "Operating status modification") @JsonTypeName("OPERATING_STATUS_MODIFICATION") -@ModificationErrorTypeName("OPERATING_STATUS_MODIFICATION_ERROR") public class OperatingStatusModificationInfos extends EquipmentModificationInfos { @Schema(description = "Action type") private ActionType action; @@ -73,7 +69,7 @@ public ReportNode createSubReportNode(ReportNode reportNode) { public void check() { super.check(); if (action == null) { - throw new NetworkModificationException(OPERATING_ACTION_TYPE_EMPTY); + throw new NetworkModificationException("Empty operating action type"); } } diff --git a/src/main/java/org/gridsuite/modification/dto/ShuntCompensatorCreationInfos.java b/src/main/java/org/gridsuite/modification/dto/ShuntCompensatorCreationInfos.java index 568ca0c6..c0ae8d79 100644 --- a/src/main/java/org/gridsuite/modification/dto/ShuntCompensatorCreationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/ShuntCompensatorCreationInfos.java @@ -15,7 +15,6 @@ import lombok.ToString; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.ShuntCompensatorCreation; @@ -30,7 +29,6 @@ @ToString(callSuper = true) @Schema(description = "Shunt compensator creation") @JsonTypeName("SHUNT_COMPENSATOR_CREATION") -@ModificationErrorTypeName("CREATE_SHUNT_COMPENSATOR_ERROR") public class ShuntCompensatorCreationInfos extends InjectionCreationInfos { @Schema(description = "Maximum number of sections") private Integer maximumSectionCount; diff --git a/src/main/java/org/gridsuite/modification/dto/ShuntCompensatorModificationInfos.java b/src/main/java/org/gridsuite/modification/dto/ShuntCompensatorModificationInfos.java index b7e07240..7e29d584 100644 --- a/src/main/java/org/gridsuite/modification/dto/ShuntCompensatorModificationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/ShuntCompensatorModificationInfos.java @@ -16,7 +16,6 @@ import lombok.ToString; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.ShuntCompensatorModification; @@ -31,7 +30,6 @@ @ToString(callSuper = true) @Schema(description = "Shunt compensator modification") @JsonTypeName("SHUNT_COMPENSATOR_MODIFICATION") -@ModificationErrorTypeName("MODIFY_SHUNT_COMPENSATOR_ERROR") public class ShuntCompensatorModificationInfos extends InjectionModificationInfos { @Schema(description = "Maximum number of sections") diff --git a/src/main/java/org/gridsuite/modification/dto/StaticVarCompensatorCreationInfos.java b/src/main/java/org/gridsuite/modification/dto/StaticVarCompensatorCreationInfos.java index 2e4cbf12..32de69b3 100644 --- a/src/main/java/org/gridsuite/modification/dto/StaticVarCompensatorCreationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/StaticVarCompensatorCreationInfos.java @@ -16,7 +16,6 @@ import lombok.Setter; import lombok.ToString; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.StaticVarCompensatorCreation; @@ -31,7 +30,6 @@ @ToString(callSuper = true) @Schema(description = "Static var compensator creation") @JsonTypeName("STATIC_VAR_COMPENSATOR_CREATION") -@ModificationErrorTypeName("CREATE_STATIC_VAR_COMPENSATOR_ERROR") public class StaticVarCompensatorCreationInfos extends InjectionCreationInfos { @Schema(description = "Susceptance max") private Double maxSusceptance; diff --git a/src/main/java/org/gridsuite/modification/dto/SubstationCreationInfos.java b/src/main/java/org/gridsuite/modification/dto/SubstationCreationInfos.java index 8b310291..93802d11 100644 --- a/src/main/java/org/gridsuite/modification/dto/SubstationCreationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/SubstationCreationInfos.java @@ -6,7 +6,6 @@ */ package org.gridsuite.modification.dto; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.SubstationCreation; @@ -31,7 +30,6 @@ @ToString(callSuper = true) @Schema(description = "Substation creation") @JsonTypeName("SUBSTATION_CREATION") -@ModificationErrorTypeName("CREATE_SUBSTATION_ERROR") public class SubstationCreationInfos extends EquipmentCreationInfos { @Schema(description = "Substation country") diff --git a/src/main/java/org/gridsuite/modification/dto/SubstationModificationInfos.java b/src/main/java/org/gridsuite/modification/dto/SubstationModificationInfos.java index 5ee5c400..a8193786 100644 --- a/src/main/java/org/gridsuite/modification/dto/SubstationModificationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/SubstationModificationInfos.java @@ -17,7 +17,6 @@ import lombok.ToString; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.SubstationModification; @@ -32,7 +31,6 @@ @JsonInclude(JsonInclude.Include.NON_NULL) @Schema(description = "Substation modification") @JsonTypeName("SUBSTATION_MODIFICATION") -@ModificationErrorTypeName("MODIFY_SUBSTATION_ERROR") public class SubstationModificationInfos extends BasicEquipmentModificationInfos { @Schema(description = "country modification") private AttributeModification country; diff --git a/src/main/java/org/gridsuite/modification/dto/TwoWindingsTransformerCreationInfos.java b/src/main/java/org/gridsuite/modification/dto/TwoWindingsTransformerCreationInfos.java index 1dadad23..c9901340 100644 --- a/src/main/java/org/gridsuite/modification/dto/TwoWindingsTransformerCreationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/TwoWindingsTransformerCreationInfos.java @@ -15,7 +15,6 @@ import lombok.ToString; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.TwoWindingsTransformerCreation; @@ -30,7 +29,6 @@ @ToString(callSuper = true) @Schema(description = "Two windings transformer creation") @JsonTypeName("TWO_WINDINGS_TRANSFORMER_CREATION") -@ModificationErrorTypeName("CREATE_TWO_WINDINGS_TRANSFORMER_ERROR") public class TwoWindingsTransformerCreationInfos extends BranchCreationInfos { @Schema(description = "Magnetizing conductance") diff --git a/src/main/java/org/gridsuite/modification/dto/TwoWindingsTransformerModificationInfos.java b/src/main/java/org/gridsuite/modification/dto/TwoWindingsTransformerModificationInfos.java index 9cfca30a..de637c2a 100644 --- a/src/main/java/org/gridsuite/modification/dto/TwoWindingsTransformerModificationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/TwoWindingsTransformerModificationInfos.java @@ -12,7 +12,6 @@ import lombok.*; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.TwoWindingsTransformerModification; @@ -26,7 +25,6 @@ @ToString(callSuper = true) @Schema(description = "Two windings transformer modification") @JsonTypeName("TWO_WINDINGS_TRANSFORMER_MODIFICATION") -@ModificationErrorTypeName("MODIFY_TWO_WINDINGS_TRANSFORMER_ERROR") public class TwoWindingsTransformerModificationInfos extends BranchModificationInfos { @Schema(description = "Magnetizing conductance") diff --git a/src/main/java/org/gridsuite/modification/dto/VoltageInitModificationInfos.java b/src/main/java/org/gridsuite/modification/dto/VoltageInitModificationInfos.java index 39ac1288..4b371e70 100644 --- a/src/main/java/org/gridsuite/modification/dto/VoltageInitModificationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/VoltageInitModificationInfos.java @@ -13,7 +13,6 @@ import lombok.NoArgsConstructor; import lombok.Setter; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.VoltageInitModification; @@ -31,7 +30,6 @@ @Setter @Schema(description = "Voltage init modification infos") @JsonTypeName("VOLTAGE_INIT_MODIFICATION") -@ModificationErrorTypeName("VOLTAGE_INIT_MODIFICATION_ERROR") public class VoltageInitModificationInfos extends ModificationInfos { @Schema(description = "generators modifications") private List generators; diff --git a/src/main/java/org/gridsuite/modification/dto/VoltageLevelCreationInfos.java b/src/main/java/org/gridsuite/modification/dto/VoltageLevelCreationInfos.java index d007d7c7..1fd8516e 100644 --- a/src/main/java/org/gridsuite/modification/dto/VoltageLevelCreationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/VoltageLevelCreationInfos.java @@ -15,7 +15,6 @@ import lombok.Setter; import lombok.ToString; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.VoltageLevelCreation; @@ -33,7 +32,6 @@ @ToString(callSuper = true) @Schema(description = "Voltage level creation") @JsonTypeName("VOLTAGE_LEVEL_CREATION") -@ModificationErrorTypeName("CREATE_VOLTAGE_LEVEL_ERROR") public class VoltageLevelCreationInfos extends EquipmentCreationInfos { @Schema(description = "substation id") diff --git a/src/main/java/org/gridsuite/modification/dto/VoltageLevelModificationInfos.java b/src/main/java/org/gridsuite/modification/dto/VoltageLevelModificationInfos.java index b077c85c..b84b2483 100644 --- a/src/main/java/org/gridsuite/modification/dto/VoltageLevelModificationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/VoltageLevelModificationInfos.java @@ -15,7 +15,6 @@ import lombok.Setter; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.VoltageLevelModification; @@ -29,7 +28,6 @@ @Setter @Schema(description = "Voltage level modification") @JsonTypeName("VOLTAGE_LEVEL_MODIFICATION") -@ModificationErrorTypeName("MODIFY_VOLTAGE_LEVEL_ERROR") public class VoltageLevelModificationInfos extends BasicEquipmentModificationInfos { @Schema(description = "nominal voltage in kV") private AttributeModification nominalV; diff --git a/src/main/java/org/gridsuite/modification/dto/VoltageLevelTopologyModificationInfos.java b/src/main/java/org/gridsuite/modification/dto/VoltageLevelTopologyModificationInfos.java index a081c04d..0b8bf4cb 100644 --- a/src/main/java/org/gridsuite/modification/dto/VoltageLevelTopologyModificationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/VoltageLevelTopologyModificationInfos.java @@ -14,7 +14,6 @@ import lombok.NoArgsConstructor; import lombok.Setter; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.VoltageLevelTopologyModification; @@ -30,7 +29,6 @@ @Setter @Schema(description = "Voltage level topology modification") @JsonTypeName("VOLTAGE_LEVEL_TOPOLOGY_MODIFICATION") -@ModificationErrorTypeName("MODIFY_VOLTAGE_LEVEL_TOPOLOGY_ERROR") public class VoltageLevelTopologyModificationInfos extends EquipmentModificationInfos { @Schema(description = "Switch attribute modification list") diff --git a/src/main/java/org/gridsuite/modification/dto/VscCreationInfos.java b/src/main/java/org/gridsuite/modification/dto/VscCreationInfos.java index 37e9d2ad..3417709b 100644 --- a/src/main/java/org/gridsuite/modification/dto/VscCreationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/VscCreationInfos.java @@ -17,7 +17,6 @@ import lombok.ToString; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.VscCreation; @@ -32,7 +31,6 @@ @ToString(callSuper = true) @Schema(description = "VSC creation") @JsonTypeName("VSC_CREATION") -@ModificationErrorTypeName("CREATE_VSC_ERROR") public class VscCreationInfos extends EquipmentCreationInfos { @Schema(description = "DC nominal voltage") private Double nominalV; diff --git a/src/main/java/org/gridsuite/modification/dto/VscModificationInfos.java b/src/main/java/org/gridsuite/modification/dto/VscModificationInfos.java index 8de25feb..b48dc2cb 100644 --- a/src/main/java/org/gridsuite/modification/dto/VscModificationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/VscModificationInfos.java @@ -7,7 +7,6 @@ import lombok.*; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.VscModification; @@ -21,7 +20,6 @@ @ToString(callSuper = true) @Schema(description = "VSC modification") @JsonTypeName("VSC_MODIFICATION") -@ModificationErrorTypeName("MODIFY_VSC_ERROR") public class VscModificationInfos extends BasicEquipmentModificationInfos { @Schema(description = "DC nominal voltage") private AttributeModification nominalV; diff --git a/src/main/java/org/gridsuite/modification/dto/annotation/ModificationErrorTypeName.java b/src/main/java/org/gridsuite/modification/dto/annotation/ModificationErrorTypeName.java deleted file mode 100644 index 4f366ccd..00000000 --- a/src/main/java/org/gridsuite/modification/dto/annotation/ModificationErrorTypeName.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * Copyright (c) 2023, RTE (http://www.rte-france.com) - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ -package org.gridsuite.modification.dto.annotation; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * @author Slimane Amar - */ -@Target({ElementType.ANNOTATION_TYPE, ElementType.TYPE}) -@Retention(RetentionPolicy.RUNTIME) -public @interface ModificationErrorTypeName { - public String value() default ""; -} diff --git a/src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/BatteryField.java b/src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/BatteryField.java index 8095396f..b5f07f6f 100644 --- a/src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/BatteryField.java +++ b/src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/BatteryField.java @@ -17,7 +17,6 @@ import org.gridsuite.modification.dto.OperationType; import org.gridsuite.modification.utils.ModificationUtils; -import static org.gridsuite.modification.NetworkModificationException.Type.MODIFY_BATTERY_ERROR; import static org.gridsuite.modification.modifications.BatteryModification.*; import static org.gridsuite.modification.utils.ModificationUtils.parseDoubleOrNaNIfNull; @@ -60,7 +59,7 @@ public static void setNewValue(Battery battery, String batteryField, @NotNull St case ACTIVE_POWER_SET_POINT -> { ModificationUtils.getInstance().checkActivePowerZeroOrBetweenMinAndMaxActivePower( new AttributeModification<>(Double.parseDouble(newValue), OperationType.SET), null, null, battery.getMinP(), - battery.getMaxP(), battery.getTargetP(), MODIFY_BATTERY_ERROR, errorMessage + battery.getMaxP(), battery.getTargetP(), errorMessage ); modifyBatterySetpointsAttributes(new AttributeModification<>(Double.parseDouble(newValue), OperationType.SET), null, null, null, battery, null); } @@ -68,13 +67,13 @@ public static void setNewValue(Battery battery, String batteryField, @NotNull St null, new AttributeModification<>(Double.parseDouble(newValue), OperationType.SET), null, null, battery, null); case DROOP -> { Float droopValue = Float.parseFloat(newValue); - ModificationUtils.checkIsPercentage(errorMessage, droopValue, MODIFY_BATTERY_ERROR, "Droop"); + ModificationUtils.checkIsPercentage(errorMessage, droopValue, "Droop"); ActivePowerControl activePowerControl = battery.getExtension(ActivePowerControl.class); ActivePowerControlAdder activePowerControlAdder = battery.newExtension(ActivePowerControlAdder.class); ModificationUtils.getInstance().modifyActivePowerControlAttributes( activePowerControl, activePowerControlAdder, null, new AttributeModification<>(droopValue, OperationType.SET), null, - null, MODIFY_BATTERY_ERROR, errorMessage); + null, errorMessage); } case TRANSIENT_REACTANCE -> ModificationUtils.getInstance().modifyShortCircuitExtension(new AttributeModification<>(parseDoubleOrNaNIfNull(newValue), OperationType.SET), null, battery.getExtension(BatteryShortCircuit.class), diff --git a/src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/FieldUtils.java b/src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/FieldUtils.java index 9ed56bec..99e86310 100644 --- a/src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/FieldUtils.java +++ b/src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/FieldUtils.java @@ -42,8 +42,7 @@ public static String getFieldValue(Identifiable equipment, String equipmentFi case TWO_WINDINGS_TRANSFORMER -> TwoWindingsTransformerField.getReferenceValue((TwoWindingsTransformer) equipment, equipmentField); case LINE -> LineField.getReferenceValue((Line) equipment, equipmentField); - default -> throw new NetworkModificationException(NetworkModificationException.Type.MODIFICATION_ERROR, - "Unsupported getting value for equipment type : " + equipment.getType().name()); + default -> throw new NetworkModificationException("Unsupported getting value for equipment type : " + equipment.getType().name()); }; } @@ -56,8 +55,7 @@ public static void setFieldValue(Identifiable equipment, String equipmentFiel case LOAD -> LoadField.setNewValue((Load) equipment, equipmentField, newValue); case TWO_WINDINGS_TRANSFORMER -> TwoWindingsTransformerField.setNewValue((TwoWindingsTransformer) equipment, equipmentField, newValue); case LINE -> LineField.setNewValue((Line) equipment, equipmentField, newValue); - default -> throw new NetworkModificationException(NetworkModificationException.Type.MODIFICATION_ERROR, - "Unsupported setting value for equipment type : " + equipment.getType().name()); + default -> throw new NetworkModificationException("Unsupported setting value for equipment type : " + equipment.getType().name()); } } diff --git a/src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/GeneratorField.java b/src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/GeneratorField.java index a5ae9ca5..ddc9a241 100644 --- a/src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/GeneratorField.java +++ b/src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/GeneratorField.java @@ -14,7 +14,6 @@ import org.gridsuite.modification.dto.OperationType; import org.gridsuite.modification.utils.ModificationUtils; -import static org.gridsuite.modification.NetworkModificationException.Type.MODIFY_GENERATOR_ERROR; import static org.gridsuite.modification.modifications.GeneratorModification.*; import static org.gridsuite.modification.utils.ModificationUtils.checkIsNotNegativeValue; import static org.gridsuite.modification.utils.ModificationUtils.parseDoubleOrNaNIfNull; @@ -77,20 +76,20 @@ public static void setNewValue(Generator generator, String generatorField, Strin ModificationUtils.getInstance().checkActivePowerZeroOrBetweenMinAndMaxActivePower( new AttributeModification<>(Double.parseDouble(newValue), OperationType.SET), null, null, generator.getMinP(), generator.getMaxP(), generator.getTargetP(), - MODIFY_GENERATOR_ERROR, errorMessage + errorMessage ); generator.setTargetP(Double.parseDouble(newValue)); } case RATED_NOMINAL_POWER -> { Double ratedNominalPower = parseDoubleOrNaNIfNull(newValue); - checkIsNotNegativeValue(errorMessage, ratedNominalPower, MODIFY_GENERATOR_ERROR, "Rated apparent power"); + checkIsNotNegativeValue(errorMessage, ratedNominalPower, "Rated apparent power"); modifyGeneratorActiveLimitsAttributes( null, null, new AttributeModification<>(ratedNominalPower, OperationType.SET), generator, null); } case REACTIVE_POWER_SET_POINT -> modifyTargetQ(generator, new AttributeModification<>(Double.parseDouble(newValue), OperationType.SET)); case VOLTAGE_SET_POINT -> { Double voltageSetPoint = Double.parseDouble(newValue); - checkIsNotNegativeValue(errorMessage, voltageSetPoint, MODIFY_GENERATOR_ERROR, "Voltage set point"); + checkIsNotNegativeValue(errorMessage, voltageSetPoint, "Voltage set point"); modifyTargetV(generator, new AttributeModification<>(voltageSetPoint, OperationType.SET)); } case PLANNED_ACTIVE_POWER_SET_POINT -> modifyGeneratorStartUpAttributes( @@ -106,12 +105,12 @@ public static void setNewValue(Generator generator, String generatorField, Strin modifyGeneratorStartUpAttributes(null, null, null, new AttributeModification<>(Double.parseDouble(newValue), OperationType.SET), generator, null, null); case DROOP -> { Float droopValue = Float.parseFloat(newValue); - ModificationUtils.checkIsPercentage(errorMessage, droopValue, MODIFY_GENERATOR_ERROR, "Droop"); + ModificationUtils.checkIsPercentage(errorMessage, droopValue, "Droop"); ActivePowerControl activePowerControl = generator.getExtension(ActivePowerControl.class); ActivePowerControlAdder activePowerControlAdder = generator.newExtension(ActivePowerControlAdder.class); ModificationUtils.getInstance().modifyActivePowerControlAttributes(activePowerControl, activePowerControlAdder, null, new AttributeModification<>(droopValue, OperationType.SET), null, null, - MODIFY_GENERATOR_ERROR, errorMessage); + errorMessage); } case TRANSIENT_REACTANCE -> ModificationUtils.getInstance().modifyShortCircuitExtension(new AttributeModification<>(parseDoubleOrNaNIfNull(newValue), OperationType.SET), null, generator.getExtension(GeneratorShortCircuit.class), diff --git a/src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/LineField.java b/src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/LineField.java index f09101f6..243db6a6 100644 --- a/src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/LineField.java +++ b/src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/LineField.java @@ -14,7 +14,6 @@ import org.gridsuite.modification.dto.OperationType; import org.gridsuite.modification.utils.ModificationUtils; -import static org.gridsuite.modification.NetworkModificationException.Type.MODIFY_LINE_ERROR; import static org.gridsuite.modification.modifications.LineModification.*; import static org.gridsuite.modification.utils.ModificationUtils.parseDoubleOrNaNIfNull; @@ -59,16 +58,16 @@ private static void setNewDoubleValue(Line line, LineField field, String newValu final AttributeModification attributeModification = new AttributeModification<>(doubleValue, OperationType.SET); switch (field) { case R -> { - ModificationUtils.checkIsNotNegativeValue(errorMessage, doubleValue, MODIFY_LINE_ERROR, "Resistance R"); + ModificationUtils.checkIsNotNegativeValue(errorMessage, doubleValue, "Resistance R"); modifyR(line, attributeModification, null); } case X -> modifyX(line, attributeModification, null); case G1 -> { - ModificationUtils.checkIsNotNegativeValue(errorMessage, doubleValue, MODIFY_LINE_ERROR, "Conductance G on side 1"); + ModificationUtils.checkIsNotNegativeValue(errorMessage, doubleValue, "Conductance G on side 1"); modifyG1(line, attributeModification, null); } case G2 -> { - ModificationUtils.checkIsNotNegativeValue(errorMessage, doubleValue, MODIFY_LINE_ERROR, "Conductance G on side 2"); + ModificationUtils.checkIsNotNegativeValue(errorMessage, doubleValue, "Conductance G on side 2"); modifyG2(line, attributeModification, null); } case B1 -> modifyB1(line, attributeModification, null); @@ -81,7 +80,7 @@ private static void setNewStringValue(Line line, LineField field, String newValu final AttributeModification attributeModification = new AttributeModification<>(newValue, OperationType.SET); switch (field) { case SELECTED_OPERATIONAL_LIMITS_GROUP_ID1 -> { - ModificationUtils.checkLimitsGroupExist(errorMessage, newValue, MODIFY_LINE_ERROR, + ModificationUtils.checkLimitsGroupExist(errorMessage, newValue, line.getOperationalLimitsGroups1() .stream() .map(OperationalLimitsGroup::getId) @@ -89,7 +88,7 @@ private static void setNewStringValue(Line line, LineField field, String newValu modifySelectedOperationalLimitsGroup(line, attributeModification, TwoSides.ONE, null); } case SELECTED_OPERATIONAL_LIMITS_GROUP_ID2 -> { - ModificationUtils.checkLimitsGroupExist(errorMessage, newValue, MODIFY_LINE_ERROR, + ModificationUtils.checkLimitsGroupExist(errorMessage, newValue, line.getOperationalLimitsGroups2() .stream() .map(OperationalLimitsGroup::getId) diff --git a/src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/PropertyField.java b/src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/PropertyField.java index 236562c9..5c6e96ff 100644 --- a/src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/PropertyField.java +++ b/src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/PropertyField.java @@ -14,6 +14,7 @@ import com.powsybl.iidm.network.TwoSides; import org.gridsuite.modification.NetworkModificationException; import org.gridsuite.modification.report.NetworkModificationReportResourceBundle; +import org.jspecify.annotations.NonNull; import java.util.List; @@ -96,8 +97,7 @@ public static String getReferenceValue(Identifiable equipment, String editedF } else { return switch (equipment.getType()) { case LINE, TWO_WINDINGS_TRANSFORMER -> getReferenceValue((Branch) equipment, field); - default -> throw new NetworkModificationException(NetworkModificationException.Type.MODIFICATION_ERROR, - "Unsupported getting value for equipment type : " + " [" + field + "," + equipment.getType() + "]"); + default -> throw unsupportedGettingField(equipment, field); }; } } @@ -106,8 +106,7 @@ public static String getReferenceValue(Branch branch, PropertyField field) { return switch (field) { case OPERATIONAL_LIMITS_GROUP_1_WITH_PROPERTIES -> branch.getSelectedOperationalLimitsGroupId1().orElse(null); case OPERATIONAL_LIMITS_GROUP_2_WITH_PROPERTIES -> branch.getSelectedOperationalLimitsGroupId2().orElse(null); - default -> throw new NetworkModificationException(NetworkModificationException.Type.MODIFICATION_ERROR, - "Unsupported getting value for equipment type : " + " [" + field + "," + branch.getType() + "]"); + default -> throw unsupportedGettingField(branch, field); }; } @@ -118,8 +117,7 @@ public static String getNewValue(Identifiable equipment, String editedField, } else { return switch (equipment.getType()) { case LINE, TWO_WINDINGS_TRANSFORMER -> getNewValue((Branch) equipment, field, propertyName, propertyValue); - default -> throw new NetworkModificationException(NetworkModificationException.Type.MODIFICATION_ERROR, - "Unsupported getting value for equipment type : " + " [" + field + "," + equipment.getType() + "]"); + default -> throw unsupportedGettingField(equipment, field); }; } } @@ -128,8 +126,7 @@ public static String getNewValue(Branch equipment, PropertyField field, Strin return switch (field) { case OPERATIONAL_LIMITS_GROUP_1_WITH_PROPERTIES -> getNewValue(equipment, TwoSides.ONE, propertyName, propertyValue); case OPERATIONAL_LIMITS_GROUP_2_WITH_PROPERTIES -> getNewValue(equipment, TwoSides.TWO, propertyName, propertyValue); - default -> throw new NetworkModificationException(NetworkModificationException.Type.MODIFICATION_ERROR, - "Unsupported getting value for equipment type : " + " [" + field + "," + equipment.getType() + "]"); + default -> throw unsupportedGettingField(equipment, field); }; } @@ -153,8 +150,7 @@ public static void setNewValue(Identifiable equipment, String editedField, St } else { switch (equipment.getType()) { case LINE, TWO_WINDINGS_TRANSFORMER -> setNewValue((Branch) equipment, field, newValue); - default -> throw new NetworkModificationException(NetworkModificationException.Type.MODIFICATION_ERROR, - "Unsupported setting value for equipment type : " + " [" + field + "," + equipment.getType() + "]"); + default -> throw unsupportedGettingField(equipment, field); } } } @@ -163,8 +159,11 @@ private static void setNewValue(Branch branch, PropertyField field, String ne switch (field) { case OPERATIONAL_LIMITS_GROUP_1_WITH_PROPERTIES -> branch.setSelectedOperationalLimitsGroup1(newValue); case OPERATIONAL_LIMITS_GROUP_2_WITH_PROPERTIES -> branch.setSelectedOperationalLimitsGroup2(newValue); - default -> throw new NetworkModificationException(NetworkModificationException.Type.MODIFICATION_ERROR, - "Unsupported setting value for equipment type : " + " [" + field + "," + branch.getType() + "]"); + default -> throw unsupportedGettingField(branch, field); } } + + private static @NonNull NetworkModificationException unsupportedGettingField(Identifiable equipment, PropertyField field) { + return new NetworkModificationException("Unsupported getting value for equipment type : " + " [" + field + "," + equipment.getType() + "]"); + } } diff --git a/src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/ShuntCompensatorField.java b/src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/ShuntCompensatorField.java index 50e99b04..405f8c56 100644 --- a/src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/ShuntCompensatorField.java +++ b/src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/ShuntCompensatorField.java @@ -42,8 +42,7 @@ public static String getReferenceValue(ShuntCompensator shuntCompensator, String public static void setNewValue(ShuntCompensator shuntCompensator, String shuntCompensatorField, @NotNull String newValue) { if (shuntCompensator.getModelType() != ShuntCompensatorModelType.LINEAR) { - throw new NetworkModificationException(NetworkModificationException.Type.BY_FORMULA_MODIFICATION_ERROR, - String.format("Shunt compensator with %s model is not supported", shuntCompensator.getModelType())); + throw new NetworkModificationException(String.format("Shunt compensator with %s model is not supported", shuntCompensator.getModelType())); } ShuntCompensatorLinearModel model = shuntCompensator.getModel(ShuntCompensatorLinearModel.class); ShuntCompensatorField field = ShuntCompensatorField.valueOf(shuntCompensatorField); diff --git a/src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/TwoWindingsTransformerField.java b/src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/TwoWindingsTransformerField.java index 38534127..b75b1753 100644 --- a/src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/TwoWindingsTransformerField.java +++ b/src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/TwoWindingsTransformerField.java @@ -18,8 +18,6 @@ import java.util.List; -import static org.gridsuite.modification.NetworkModificationException.Type.MODIFY_LINE_ERROR; -import static org.gridsuite.modification.NetworkModificationException.Type.MODIFY_TWO_WINDINGS_TRANSFORMER_ERROR; import static org.gridsuite.modification.modifications.GeneratorModification.ERROR_MESSAGE; import static org.gridsuite.modification.modifications.TwoWindingsTransformerModification.*; import static org.gridsuite.modification.utils.ModificationUtils.checkIsNotNegativeValue; @@ -142,29 +140,29 @@ private static void setNewDoubleValue(TwoWindingsTransformer transformer, TwoWin final AttributeModification attributeModification = new AttributeModification<>(doubleValue, OperationType.SET); switch (field) { case R -> { - checkIsNotNegativeValue(errorMessage, doubleValue, MODIFY_TWO_WINDINGS_TRANSFORMER_ERROR, "Resistance R"); + checkIsNotNegativeValue(errorMessage, doubleValue, "Resistance R"); modifyR(transformer, attributeModification, null); } case X -> modifyX(transformer, attributeModification, null); case G -> { - checkIsNotNegativeValue(errorMessage, doubleValue, MODIFY_TWO_WINDINGS_TRANSFORMER_ERROR, "Conductance G"); + checkIsNotNegativeValue(errorMessage, doubleValue, "Conductance G"); modifyG(transformer, attributeModification, null); } case B -> modifyB(transformer, attributeModification, null); case RATED_U1 -> { - checkIsNotNegativeValue(errorMessage, doubleValue, MODIFY_TWO_WINDINGS_TRANSFORMER_ERROR, "Rated Voltage on side 1"); + checkIsNotNegativeValue(errorMessage, doubleValue, "Rated Voltage on side 1"); modifyRatedU1(transformer, attributeModification, null); } case RATED_U2 -> { - checkIsNotNegativeValue(errorMessage, doubleValue, MODIFY_TWO_WINDINGS_TRANSFORMER_ERROR, "Rated Voltage on side 2"); + checkIsNotNegativeValue(errorMessage, doubleValue, "Rated Voltage on side 2"); modifyRatedU2(transformer, attributeModification, null); } case RATED_S -> { - checkIsNotNegativeValue(errorMessage, doubleValue, MODIFY_TWO_WINDINGS_TRANSFORMER_ERROR, "Rated nominal power"); + checkIsNotNegativeValue(errorMessage, doubleValue, "Rated nominal power"); modifyRatedS(transformer, attributeModification, null); } case TARGET_V -> { - checkIsNotNegativeValue(errorMessage, doubleValue, MODIFY_TWO_WINDINGS_TRANSFORMER_ERROR, "Target Voltage"); + checkIsNotNegativeValue(errorMessage, doubleValue, "Target Voltage"); modifyTargets(ratioTapChanger, null, true, attributeModification, null, null); } case RATIO_LOW_TAP_POSITION -> processTapChangerPositionsAndSteps(ratioTapChanger, null, true, @@ -189,7 +187,7 @@ private static void setNewStringValue(TwoWindingsTransformer transformer, TwoWin final AttributeModification attributeModification = new AttributeModification<>(newValue, OperationType.SET); switch (field) { case SELECTED_OPERATIONAL_LIMITS_GROUP_ID1 -> { - ModificationUtils.checkLimitsGroupExist(errorMessage, newValue, MODIFY_LINE_ERROR, + ModificationUtils.checkLimitsGroupExist(errorMessage, newValue, transformer.getOperationalLimitsGroups1() .stream() .map(OperationalLimitsGroup::getId) @@ -197,7 +195,7 @@ private static void setNewStringValue(TwoWindingsTransformer transformer, TwoWin modifySelectedOperationalLimitsGroup(transformer, attributeModification, TwoSides.ONE, null); } case SELECTED_OPERATIONAL_LIMITS_GROUP_ID2 -> { - ModificationUtils.checkLimitsGroupExist(errorMessage, newValue, MODIFY_LINE_ERROR, + ModificationUtils.checkLimitsGroupExist(errorMessage, newValue, transformer.getOperationalLimitsGroups2() .stream() .map(OperationalLimitsGroup::getId) diff --git a/src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/VoltageLevelField.java b/src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/VoltageLevelField.java index ac788a7e..7c865a8d 100644 --- a/src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/VoltageLevelField.java +++ b/src/main/java/org/gridsuite/modification/dto/byfilter/equipmentfield/VoltageLevelField.java @@ -12,7 +12,6 @@ import org.gridsuite.modification.dto.AttributeModification; import org.gridsuite.modification.dto.OperationType; -import static org.gridsuite.modification.NetworkModificationException.Type.MODIFY_VOLTAGE_LEVEL_ERROR; import static org.gridsuite.modification.modifications.GeneratorModification.ERROR_MESSAGE; import static org.gridsuite.modification.modifications.VoltageLevelModification.*; import static org.gridsuite.modification.utils.ModificationUtils.checkIsNotNegativeValue; @@ -46,17 +45,17 @@ public static void setNewValue(VoltageLevel voltageLevel, String voltageLevelFie switch (field) { case NOMINAL_VOLTAGE -> { Double nominalVoltage = Double.valueOf(newValue); - checkIsNotNegativeValue(errorMessage, nominalVoltage, MODIFY_VOLTAGE_LEVEL_ERROR, "Nominal voltage"); + checkIsNotNegativeValue(errorMessage, nominalVoltage, "Nominal voltage"); modifyNominalV(voltageLevel, new AttributeModification<>(nominalVoltage, OperationType.SET), null); } case LOW_VOLTAGE_LIMIT -> { Double lowVoltageLimit = parseDoubleOrNaNIfNull(newValue); - checkIsNotNegativeValue(errorMessage, lowVoltageLimit, MODIFY_VOLTAGE_LEVEL_ERROR, "Low voltage limit"); + checkIsNotNegativeValue(errorMessage, lowVoltageLimit, "Low voltage limit"); modifLowVoltageLimit(voltageLevel, new AttributeModification<>(lowVoltageLimit, OperationType.SET), null); } case HIGH_VOLTAGE_LIMIT -> { Double highVoltageLimit = parseDoubleOrNaNIfNull(newValue); - checkIsNotNegativeValue(errorMessage, highVoltageLimit, MODIFY_VOLTAGE_LEVEL_ERROR, "High voltage limit"); + checkIsNotNegativeValue(errorMessage, highVoltageLimit, "High voltage limit"); modifyHighVoltageLimit(voltageLevel, new AttributeModification<>(highVoltageLimit, OperationType.SET), null); } case LOW_SHORT_CIRCUIT_CURRENT_LIMIT -> modifyVoltageLevelShortCircuit( diff --git a/src/main/java/org/gridsuite/modification/dto/byfilter/formula/ReferenceFieldOrValue.java b/src/main/java/org/gridsuite/modification/dto/byfilter/formula/ReferenceFieldOrValue.java index bf12187f..8cfbcb18 100644 --- a/src/main/java/org/gridsuite/modification/dto/byfilter/formula/ReferenceFieldOrValue.java +++ b/src/main/java/org/gridsuite/modification/dto/byfilter/formula/ReferenceFieldOrValue.java @@ -30,8 +30,7 @@ public class ReferenceFieldOrValue { public Double getRefOrValue(Identifiable identifiable) { if (value == null && equipmentField == null) { - throw new NetworkModificationException(NetworkModificationException.Type.BY_FORMULA_MODIFICATION_ERROR, - "There is no value or reference to any of the equipment fields"); + throw new NetworkModificationException("By formula modification error: There is no value or reference to any of the equipment fields"); } if (value != null && !Double.isNaN(value)) { diff --git a/src/main/java/org/gridsuite/modification/dto/tabular/LimitSetsTabularModificationInfos.java b/src/main/java/org/gridsuite/modification/dto/tabular/LimitSetsTabularModificationInfos.java index f920a46a..43bbac42 100644 --- a/src/main/java/org/gridsuite/modification/dto/tabular/LimitSetsTabularModificationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/tabular/LimitSetsTabularModificationInfos.java @@ -12,7 +12,6 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; /** * @author Hugo Marcellin @@ -23,6 +22,5 @@ @Data @Schema(description = "Limit sets tabular modification") @JsonTypeName("LIMIT_SETS_TABULAR_MODIFICATION") -@ModificationErrorTypeName("LIMIT_SETS_TABULAR_MODIFICATION_ERROR") public class LimitSetsTabularModificationInfos extends TabularModificationInfos { } diff --git a/src/main/java/org/gridsuite/modification/dto/tabular/TabularCreationInfos.java b/src/main/java/org/gridsuite/modification/dto/tabular/TabularCreationInfos.java index 9804a103..235f33fc 100644 --- a/src/main/java/org/gridsuite/modification/dto/tabular/TabularCreationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/tabular/TabularCreationInfos.java @@ -13,7 +13,6 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.tabular.TabularCreation; @@ -29,7 +28,6 @@ @Data @Schema(description = "Tabular creation") @JsonTypeName("TABULAR_CREATION") -@ModificationErrorTypeName("TABULAR_CREATION_ERROR") public class TabularCreationInfos extends TabularBaseInfos { @Override diff --git a/src/main/java/org/gridsuite/modification/dto/tabular/TabularModificationInfos.java b/src/main/java/org/gridsuite/modification/dto/tabular/TabularModificationInfos.java index 97980ccb..df6d138d 100644 --- a/src/main/java/org/gridsuite/modification/dto/tabular/TabularModificationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/tabular/TabularModificationInfos.java @@ -9,7 +9,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.powsybl.commons.report.ReportNode; import lombok.*; -import org.gridsuite.modification.dto.annotation.ModificationErrorTypeName; import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.tabular.TabularModification; @@ -28,7 +27,6 @@ @Data @Schema(description = "Tabular modification") @JsonTypeName("TABULAR_MODIFICATION") -@ModificationErrorTypeName("TABULAR_MODIFICATION_ERROR") public class TabularModificationInfos extends TabularBaseInfos { @Override public AbstractModification toModification() { diff --git a/src/main/java/org/gridsuite/modification/modifications/AbstractBranchModification.java b/src/main/java/org/gridsuite/modification/modifications/AbstractBranchModification.java index 6fb1b5c2..777a8dd2 100644 --- a/src/main/java/org/gridsuite/modification/modifications/AbstractBranchModification.java +++ b/src/main/java/org/gridsuite/modification/modifications/AbstractBranchModification.java @@ -19,7 +19,6 @@ import java.util.*; import java.util.stream.Collectors; -import static org.gridsuite.modification.NetworkModificationException.Type.BRANCH_MODIFICATION_ERROR; import static org.gridsuite.modification.utils.ModificationUtils.NO_VALUE; /** @@ -258,8 +257,7 @@ private void updateConnections(Branch branch, BranchModificationInfos branchM errorTypes.add(Boolean.TRUE.equals(modificationInfos.getTerminal2Connected().getValue()) ? "connect" : "disconnect"); } if (!errorSides.isEmpty()) { - throw new NetworkModificationException(BRANCH_MODIFICATION_ERROR, - String.format("Could not %s equipment '%s' on side %s", + throw new NetworkModificationException(String.format("Could not %s equipment '%s' on side %s", errorTypes.stream().distinct().collect(Collectors.joining("/")), branch.getId(), errorSides.stream().map(Enum::toString).collect(Collectors.joining("/")))); diff --git a/src/main/java/org/gridsuite/modification/modifications/AbstractModification.java b/src/main/java/org/gridsuite/modification/modifications/AbstractModification.java index 4dc0b5b5..74cb238b 100644 --- a/src/main/java/org/gridsuite/modification/modifications/AbstractModification.java +++ b/src/main/java/org/gridsuite/modification/modifications/AbstractModification.java @@ -8,7 +8,6 @@ import org.gridsuite.modification.IFilterService; import org.gridsuite.modification.ILoadFlowService; -import org.gridsuite.modification.NetworkModificationException; import com.powsybl.commons.report.ReportNode; import com.powsybl.computation.ComputationManager; @@ -26,7 +25,7 @@ public void apply(Network network, NamingStrategy namingStrategy, boolean throwE apply(network, reportNode); } - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { // To perform input data check before hypothesis apply. Nothing to check here } diff --git a/src/main/java/org/gridsuite/modification/modifications/AbstractScaling.java b/src/main/java/org/gridsuite/modification/modifications/AbstractScaling.java index dcce76af..a7805b75 100644 --- a/src/main/java/org/gridsuite/modification/modifications/AbstractScaling.java +++ b/src/main/java/org/gridsuite/modification/modifications/AbstractScaling.java @@ -52,7 +52,7 @@ public void apply(Network network, ReportNode subReportNode) { .filter(distinctByKey(FilterInfos::getId)) .collect(Collectors.toMap(FilterInfos::getId, FilterInfos::getName)); - Map exportFilters = ModificationUtils.getUuidFilterEquipmentsMap(filterService, network, subReportNode, filters, scalingInfos.getErrorType()); + Map exportFilters = ModificationUtils.getUuidFilterEquipmentsMap(filterService, network, subReportNode, filters); if (exportFilters != null) { ModificationUtils.logWrongEquipmentsIdsFilters(subReportNode, exportFilters, filters); @@ -92,7 +92,7 @@ private void applyVariation(Network network, applyStackingUpVariation(network, subReportNode, identifiableAttributes, variation); break; default: - throw new NetworkModificationException(scalingInfos.getErrorType(), String.format("This variation mode is not supported : %s", variation.getVariationMode().name())); + throw new NetworkModificationException(String.format("This variation mode is not supported : %s", variation.getVariationMode().name())); } } diff --git a/src/main/java/org/gridsuite/modification/modifications/BatteryCreation.java b/src/main/java/org/gridsuite/modification/modifications/BatteryCreation.java index c3eea688..d96ad5da 100644 --- a/src/main/java/org/gridsuite/modification/modifications/BatteryCreation.java +++ b/src/main/java/org/gridsuite/modification/modifications/BatteryCreation.java @@ -19,8 +19,6 @@ import java.util.ArrayList; import java.util.List; -import static org.gridsuite.modification.NetworkModificationException.Type.BATTERY_ALREADY_EXISTS; -import static org.gridsuite.modification.NetworkModificationException.Type.CREATE_BATTERY_ERROR; import static org.gridsuite.modification.modifications.BatteryModification.ERROR_MESSAGE; import static org.gridsuite.modification.utils.ModificationUtils.*; @@ -36,9 +34,9 @@ public BatteryCreation(BatteryCreationInfos modificationInfos) { } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { if (network.getBattery(modificationInfos.getEquipmentId()) != null) { - throw new NetworkModificationException(BATTERY_ALREADY_EXISTS, modificationInfos.getEquipmentId()); + throw new NetworkModificationException("Battery already exists: " + modificationInfos.getEquipmentId()); } String errorMessage = "Battery '" + modificationInfos.getEquipmentId() + "' : "; @@ -49,13 +47,12 @@ public void check(Network network) throws NetworkModificationException { // check reactive limits ModificationUtils.getInstance().checkReactiveLimitsCreation(modificationInfos, - modificationInfos.getErrorType(), modificationInfos.getEquipmentId(), "Battery"); ModificationUtils.getInstance().checkActivePowerControl(modificationInfos.getParticipate(), - modificationInfos.getDroop(), CREATE_BATTERY_ERROR, String.format(ERROR_MESSAGE, modificationInfos.getEquipmentId())); - checkIsPercentage(errorMessage, modificationInfos.getDroop(), CREATE_BATTERY_ERROR, "Droop"); + modificationInfos.getDroop(), String.format(ERROR_MESSAGE, modificationInfos.getEquipmentId())); + checkIsPercentage(errorMessage, modificationInfos.getDroop(), "Droop"); } @Override diff --git a/src/main/java/org/gridsuite/modification/modifications/BatteryModification.java b/src/main/java/org/gridsuite/modification/modifications/BatteryModification.java index afe08ba6..88539292 100644 --- a/src/main/java/org/gridsuite/modification/modifications/BatteryModification.java +++ b/src/main/java/org/gridsuite/modification/modifications/BatteryModification.java @@ -20,7 +20,6 @@ import java.util.Collection; import java.util.List; -import static org.gridsuite.modification.NetworkModificationException.Type.MODIFY_BATTERY_ERROR; import static org.gridsuite.modification.utils.ModificationUtils.checkIsPercentage; import static org.gridsuite.modification.utils.ModificationUtils.insertReportNode; @@ -38,23 +37,23 @@ public BatteryModification(BatteryModificationInfos modificationInfos) { } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { if (modificationInfos == null) { - throw new NetworkModificationException(MODIFY_BATTERY_ERROR, "Missing required attributes to modify the equipment"); + throw new NetworkModificationException("Missing required attributes to modify the equipment"); } Battery battery = ModificationUtils.getInstance().getBattery(network, modificationInfos.getEquipmentId()); String errorMessage = "Battery '" + modificationInfos.getEquipmentId() + "' : "; ModificationUtils.getInstance().checkVoltageLevelModification(network, modificationInfos.getVoltageLevelId(), modificationInfos.getBusOrBusbarSectionId(), battery.getTerminal()); ModificationUtils.getInstance().checkReactiveLimit(battery, modificationInfos.getMinQ(), modificationInfos.getMaxQ(), - modificationInfos.getReactiveCapabilityCurvePoints(), MODIFY_BATTERY_ERROR, errorMessage); - checkActivePowerZeroOrBetweenMinAndMaxActivePowerBattery(modificationInfos, battery, MODIFY_BATTERY_ERROR, errorMessage); + modificationInfos.getReactiveCapabilityCurvePoints(), errorMessage); + checkActivePowerZeroOrBetweenMinAndMaxActivePowerBattery(modificationInfos, battery, errorMessage); if (modificationInfos.getDroop() != null) { - checkIsPercentage(errorMessage, modificationInfos.getDroop().getValue(), MODIFY_BATTERY_ERROR, "Droop"); + checkIsPercentage(errorMessage, modificationInfos.getDroop().getValue(), "Droop"); } } - private void checkActivePowerZeroOrBetweenMinAndMaxActivePowerBattery(BatteryModificationInfos modificationInfos, Battery battery, NetworkModificationException.Type exceptionType, String errorMessage) { + private void checkActivePowerZeroOrBetweenMinAndMaxActivePowerBattery(BatteryModificationInfos modificationInfos, Battery battery, String errorMessage) { ModificationUtils.getInstance().checkActivePowerZeroOrBetweenMinAndMaxActivePower( modificationInfos.getTargetP(), modificationInfos.getMinP(), @@ -62,7 +61,6 @@ private void checkActivePowerZeroOrBetweenMinAndMaxActivePowerBattery(BatteryMod battery.getMinP(), battery.getMaxP(), battery.getTargetP(), - exceptionType, errorMessage ); } @@ -191,7 +189,7 @@ public static ReportNode modifyBatteryActivePowerControlAttributes(AttributeModi ActivePowerControl activePowerControl = battery.getExtension(ActivePowerControl.class); ActivePowerControlAdder activePowerControlAdder = battery.newExtension(ActivePowerControlAdder.class); return ModificationUtils.getInstance().modifyActivePowerControlAttributes(activePowerControl, activePowerControlAdder, - participate, droop, subReportNode, subReportNodeSetpoints, MODIFY_BATTERY_ERROR, String.format(ERROR_MESSAGE, battery.getId())); + participate, droop, subReportNode, subReportNodeSetpoints, String.format(ERROR_MESSAGE, battery.getId())); } private ReportNode modifyBatteryConnectivityAttributes(BatteryModificationInfos modificationInfos, diff --git a/src/main/java/org/gridsuite/modification/modifications/ByFilterDeletion.java b/src/main/java/org/gridsuite/modification/modifications/ByFilterDeletion.java index a1dca652..74537725 100644 --- a/src/main/java/org/gridsuite/modification/modifications/ByFilterDeletion.java +++ b/src/main/java/org/gridsuite/modification/modifications/ByFilterDeletion.java @@ -69,7 +69,7 @@ public void apply(Network network, ReportNode subReportNode) { .filter(distinctByKey(FilterInfos::getId)) .collect(Collectors.toMap(FilterInfos::getId, FilterInfos::getName)); - Map exportFilters = ModificationUtils.getUuidFilterEquipmentsMap(filterService, network, subReportNode, filters, modificationInfos.getErrorType()); + Map exportFilters = ModificationUtils.getUuidFilterEquipmentsMap(filterService, network, subReportNode, filters); if (exportFilters != null) { ModificationUtils.logWrongEquipmentsIdsFilters(subReportNode, exportFilters, filters); Set identifiableAttributes = ModificationUtils.getIdentifiableAttributes(exportFilters, modificationInfos.getFilters(), subReportNode); @@ -107,7 +107,7 @@ private void applyFilterDeletion(Network network, ReportNode subReportNode, Set< } else if (identifiableType == IdentifiableType.HVDC_LINE) { identifiableAttributes.forEach(identifiableAttribute -> removeHvdcLine(network, subReportNode, identifiableAttribute)); } else { - throw NetworkModificationException.createEquipmentTypeUnknown(identifiableType.name()); + throw new NetworkModificationException("The equipment type : " + identifiableType.name() + " is unknown"); } } diff --git a/src/main/java/org/gridsuite/modification/modifications/CreateVoltageLevelSection.java b/src/main/java/org/gridsuite/modification/modifications/CreateVoltageLevelSection.java index 5ffbe42e..f9fe81e9 100644 --- a/src/main/java/org/gridsuite/modification/modifications/CreateVoltageLevelSection.java +++ b/src/main/java/org/gridsuite/modification/modifications/CreateVoltageLevelSection.java @@ -23,9 +23,6 @@ import java.util.ArrayList; import java.util.List; -import static org.gridsuite.modification.NetworkModificationException.Type.BUSBAR_SECTION_NOT_FOUND; -import static org.gridsuite.modification.NetworkModificationException.Type.CREATE_VOLTAGE_LEVEL_ERROR; - /** * @author Ghazwa Rehili */ @@ -38,15 +35,14 @@ public CreateVoltageLevelSection(CreateVoltageLevelSectionInfos modificationInfo } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { var voltageLevel = network.getVoltageLevel(modificationInfos.getVoltageLevelId()); if (voltageLevel == null) { - throw new NetworkModificationException(CREATE_VOLTAGE_LEVEL_ERROR, "Voltage level not found: " + modificationInfos.getVoltageLevelId()); + throw new NetworkModificationException("Voltage level not found: " + modificationInfos.getVoltageLevelId()); } var bbs = network.getBusbarSection(modificationInfos.getBusbarSectionId()); if (bbs == null) { - throw new NetworkModificationException(BUSBAR_SECTION_NOT_FOUND, - String.format("%s not found in voltage level %s", + throw new NetworkModificationException(String.format("%s not found in voltage level %s", modificationInfos.getBusbarSectionId(), voltageLevel.getId())); } @@ -56,8 +52,7 @@ public void check(Network network) throws NetworkModificationException { } var busbarIndex = bbs.getExtension(BusbarSectionPosition.class).getBusbarIndex(); if (busbarIndex != modificationInfos.getBusbarIndex()) { - throw new NetworkModificationException(BUSBAR_SECTION_NOT_FOUND, - String.format("%s is not the busbar index of the busbar section %s in voltage level %s", + throw new NetworkModificationException(String.format("%s is not the busbar index of the busbar section %s in voltage level %s", modificationInfos.getBusbarIndex(), bbs.getId(), voltageLevel.getId())); diff --git a/src/main/java/org/gridsuite/modification/modifications/CreateVoltageLevelTopology.java b/src/main/java/org/gridsuite/modification/modifications/CreateVoltageLevelTopology.java index a62fecaa..bf815f15 100644 --- a/src/main/java/org/gridsuite/modification/modifications/CreateVoltageLevelTopology.java +++ b/src/main/java/org/gridsuite/modification/modifications/CreateVoltageLevelTopology.java @@ -21,8 +21,6 @@ import java.util.Objects; import java.util.Optional; -import static org.gridsuite.modification.NetworkModificationException.Type.CREATE_VOLTAGE_LEVEL_TOPOLOGY_ERROR; - /** * @author Etienne Lesot */ @@ -40,13 +38,13 @@ public void check(Network network) { || createVoltageLevelTopologyInfos.getVoltageLevelId() == null || createVoltageLevelTopologyInfos.getSwitchKinds() == null || createVoltageLevelTopologyInfos.getSectionCount() == null) { - throw new NetworkModificationException(CREATE_VOLTAGE_LEVEL_TOPOLOGY_ERROR, "Missing required attributes to modify the equipment"); + throw new NetworkModificationException("Missing required attributes to modify the equipment"); } if (createVoltageLevelTopologyInfos.getSwitchKinds().size() != createVoltageLevelTopologyInfos.getSectionCount() - 1) { - throw new NetworkModificationException(CREATE_VOLTAGE_LEVEL_TOPOLOGY_ERROR, "The switch kinds list must have a size equal to the section count minus one"); + throw new NetworkModificationException("The switch kinds list must have a size equal to the section count minus one"); } if (network.getVoltageLevel(createVoltageLevelTopologyInfos.getVoltageLevelId()) == null) { - throw new NetworkModificationException(CREATE_VOLTAGE_LEVEL_TOPOLOGY_ERROR, "voltage level " + + throw new NetworkModificationException("Voltage level " + createVoltageLevelTopologyInfos.getVoltageLevelId() + " is not found"); } } diff --git a/src/main/java/org/gridsuite/modification/modifications/DeleteAttachingLine.java b/src/main/java/org/gridsuite/modification/modifications/DeleteAttachingLine.java index 17c60da8..9930a6d1 100644 --- a/src/main/java/org/gridsuite/modification/modifications/DeleteAttachingLine.java +++ b/src/main/java/org/gridsuite/modification/modifications/DeleteAttachingLine.java @@ -13,9 +13,6 @@ import org.gridsuite.modification.NetworkModificationException; import org.gridsuite.modification.dto.DeleteAttachingLineInfos; -import static org.gridsuite.modification.NetworkModificationException.Type.LINE_ALREADY_EXISTS; -import static org.gridsuite.modification.NetworkModificationException.Type.LINE_NOT_FOUND; - /** * @author bendaamerahm */ @@ -28,20 +25,20 @@ public DeleteAttachingLine(DeleteAttachingLineInfos modificationInfos) { } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { // check existing lines if (network.getLine(modificationInfos.getLineToAttachTo1Id()) == null) { - throw new NetworkModificationException(LINE_NOT_FOUND, modificationInfos.getLineToAttachTo1Id()); + throw new NetworkModificationException("Line not found: " + modificationInfos.getLineToAttachTo1Id()); } if (network.getLine(modificationInfos.getLineToAttachTo2Id()) == null) { - throw new NetworkModificationException(LINE_NOT_FOUND, modificationInfos.getLineToAttachTo2Id()); + throw new NetworkModificationException("Line not found: " + modificationInfos.getLineToAttachTo2Id()); } if (network.getLine(modificationInfos.getAttachedLineId()) == null) { - throw new NetworkModificationException(LINE_NOT_FOUND, modificationInfos.getAttachedLineId()); + throw new NetworkModificationException("Line not found: " + modificationInfos.getAttachedLineId()); } // check future line does not exist if (network.getLine(modificationInfos.getReplacingLine1Id()) != null) { - throw new NetworkModificationException(LINE_ALREADY_EXISTS, modificationInfos.getReplacingLine1Id()); + throw new NetworkModificationException("Line already exist: " + modificationInfos.getReplacingLine1Id()); } } diff --git a/src/main/java/org/gridsuite/modification/modifications/DeleteVoltageLevelOnLine.java b/src/main/java/org/gridsuite/modification/modifications/DeleteVoltageLevelOnLine.java index 7db17f0a..6c8612e7 100644 --- a/src/main/java/org/gridsuite/modification/modifications/DeleteVoltageLevelOnLine.java +++ b/src/main/java/org/gridsuite/modification/modifications/DeleteVoltageLevelOnLine.java @@ -13,9 +13,6 @@ import org.gridsuite.modification.NetworkModificationException; import org.gridsuite.modification.dto.DeleteVoltageLevelOnLineInfos; -import static org.gridsuite.modification.NetworkModificationException.Type.LINE_ALREADY_EXISTS; -import static org.gridsuite.modification.NetworkModificationException.Type.LINE_NOT_FOUND; - /** * @author bendaamerahm */ @@ -28,17 +25,17 @@ public DeleteVoltageLevelOnLine(DeleteVoltageLevelOnLineInfos modificationInfos) } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { // check existing lines if (network.getLine(modificationInfos.getLineToAttachTo1Id()) == null) { - throw new NetworkModificationException(LINE_NOT_FOUND, modificationInfos.getLineToAttachTo1Id()); + throw new NetworkModificationException("Line not found: " + modificationInfos.getLineToAttachTo1Id()); } if (network.getLine(modificationInfos.getLineToAttachTo2Id()) == null) { - throw new NetworkModificationException(LINE_NOT_FOUND, modificationInfos.getLineToAttachTo2Id()); + throw new NetworkModificationException("Line not found: " + modificationInfos.getLineToAttachTo2Id()); } // check future line does not exist if (network.getLine(modificationInfos.getReplacingLine1Id()) != null) { - throw new NetworkModificationException(LINE_ALREADY_EXISTS, modificationInfos.getReplacingLine1Id()); + throw new NetworkModificationException("Line already exists: " + modificationInfos.getReplacingLine1Id()); } } diff --git a/src/main/java/org/gridsuite/modification/modifications/EquipmentAttributeModification.java b/src/main/java/org/gridsuite/modification/modifications/EquipmentAttributeModification.java index df14618c..cc0ed0ec 100644 --- a/src/main/java/org/gridsuite/modification/modifications/EquipmentAttributeModification.java +++ b/src/main/java/org/gridsuite/modification/modifications/EquipmentAttributeModification.java @@ -14,9 +14,6 @@ import org.gridsuite.modification.NetworkModificationException; import org.gridsuite.modification.dto.EquipmentAttributeModificationInfos; -import static org.gridsuite.modification.NetworkModificationException.Type.EQUIPMENT_NOT_FOUND; -import static org.gridsuite.modification.NetworkModificationException.Type.WRONG_EQUIPMENT_TYPE; - /** * @author Slimane Amar */ @@ -29,13 +26,13 @@ public EquipmentAttributeModification(EquipmentAttributeModificationInfos modifi } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { Identifiable identifiable = network.getIdentifiable(modificationInfos.getEquipmentId()); if (identifiable == null) { - throw new NetworkModificationException(EQUIPMENT_NOT_FOUND, modificationInfos.getEquipmentId()); + throw new NetworkModificationException("Equipment not found: " + modificationInfos.getEquipmentId()); } if (identifiable.getType() != modificationInfos.getEquipmentType()) { - throw new NetworkModificationException(WRONG_EQUIPMENT_TYPE, String.format("Type of '%s' is not %s but %s", modificationInfos.getEquipmentId(), modificationInfos.getEquipmentType(), identifiable.getType())); + throw new NetworkModificationException("Wrong equipment type: " + String.format("Type of '%s' is not %s but %s", modificationInfos.getEquipmentId(), modificationInfos.getEquipmentType(), identifiable.getType())); } } @@ -79,7 +76,7 @@ private void changeSwitchAttribute(Switch aSwitch, String attributeName, Object .add(); } } else { - throw NetworkModificationException.createEquipementAttributeNotEditable(aSwitch.getType(), attributeName); + throw new NetworkModificationException(aSwitch.getType().name() + " attribute '" + attributeName + "' not editable"); } } @@ -93,7 +90,7 @@ private void changeGeneratorAttribute(Generator generator, String attributeName, .withSeverity(TypedValue.INFO_SEVERITY) .add(); } else { - throw NetworkModificationException.createEquipementAttributeNotEditable(generator.getType(), attributeName); + throw new NetworkModificationException(generator.getType().name() + " attribute '" + attributeName + "' not editable"); } } @@ -107,7 +104,7 @@ private void changeLineAttribute(Line line, String attributeName, Object attribu .withSeverity(TypedValue.INFO_SEVERITY) .add(); } else { - throw NetworkModificationException.createEquipementAttributeNotEditable(line.getType(), attributeName); + throw new NetworkModificationException(line.getType().name() + " attribute '" + attributeName + "' not editable"); } } @@ -124,7 +121,7 @@ private void changeTwoWindingsTransformerAttribute(TwoWindingsTransformer transf reportKey = "network.modification.phaseTapPositionChanged"; break; default: - throw NetworkModificationException.createEquipementAttributeNotEditable(transformer.getType(), attributeName); + throw new NetworkModificationException(transformer.getType().name() + " attribute '" + attributeName + "' not editable"); } reportNode.newReportNode() @@ -164,7 +161,7 @@ private void changeThreeWindingsTransformerAttribute(ThreeWindingsTransformer tr reportKey = "network.modification.phaseTapChanger3.tapPosition"; break; default: - throw NetworkModificationException.createEquipementAttributeNotEditable(transformer.getType(), attributeName); + throw new NetworkModificationException(transformer.getType().name() + " attribute '" + attributeName + "' not editable"); } reportNode.newReportNode() diff --git a/src/main/java/org/gridsuite/modification/modifications/EquipmentDeletion.java b/src/main/java/org/gridsuite/modification/modifications/EquipmentDeletion.java index 61873f18..0d93358e 100644 --- a/src/main/java/org/gridsuite/modification/modifications/EquipmentDeletion.java +++ b/src/main/java/org/gridsuite/modification/modifications/EquipmentDeletion.java @@ -19,8 +19,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import static org.gridsuite.modification.NetworkModificationException.Type.EQUIPMENT_NOT_FOUND; - /** * @author Ayoub Labidi */ @@ -33,10 +31,10 @@ public EquipmentDeletion(EquipmentDeletionInfos modificationInfos) { } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { Identifiable identifiable = ModificationUtils.getInstance().getEquipmentByIdentifiableType(network, modificationInfos.getEquipmentType(), modificationInfos.getEquipmentId()); if (identifiable == null) { - throw new NetworkModificationException(EQUIPMENT_NOT_FOUND, "Equipment with id=" + modificationInfos.getEquipmentId() + " not found or of bad type"); + throw new NetworkModificationException("Equipment with id=" + modificationInfos.getEquipmentId() + " not found or of bad type"); } } diff --git a/src/main/java/org/gridsuite/modification/modifications/GenerationDispatch.java b/src/main/java/org/gridsuite/modification/modifications/GenerationDispatch.java index f3d88ba4..47be067f 100644 --- a/src/main/java/org/gridsuite/modification/modifications/GenerationDispatch.java +++ b/src/main/java/org/gridsuite/modification/modifications/GenerationDispatch.java @@ -35,7 +35,6 @@ import static java.util.Comparator.comparingInt; import static java.util.stream.Collectors.collectingAndThen; import static java.util.stream.Collectors.toCollection; -import static org.gridsuite.modification.NetworkModificationException.Type.GENERATION_DISPATCH_ERROR; /** * @author Franck Lecuyer @@ -347,14 +346,14 @@ public void initApplicationContext(IFilterService filterService, ILoadFlowServic } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { double lossCoefficient = generationDispatchInfos.getLossCoefficient(); if (lossCoefficient < 0. || lossCoefficient > 100.) { - throw new NetworkModificationException(GENERATION_DISPATCH_ERROR, "The loss coefficient must be between 0 and 100"); + throw new NetworkModificationException("Generation dispatch error: the loss coefficient must be between 0 and 100"); } double defaultOutageRate = generationDispatchInfos.getDefaultOutageRate(); if (defaultOutageRate < 0. || defaultOutageRate > 100.) { - throw new NetworkModificationException(GENERATION_DISPATCH_ERROR, "The default outage rate must be between 0 and 100"); + throw new NetworkModificationException("Generation dispatch error: the default outage rate must be between 0 and 100"); } } diff --git a/src/main/java/org/gridsuite/modification/modifications/GeneratorCreation.java b/src/main/java/org/gridsuite/modification/modifications/GeneratorCreation.java index 6fd4c161..15dcc2bf 100644 --- a/src/main/java/org/gridsuite/modification/modifications/GeneratorCreation.java +++ b/src/main/java/org/gridsuite/modification/modifications/GeneratorCreation.java @@ -23,8 +23,6 @@ import java.util.ArrayList; import java.util.List; -import static org.gridsuite.modification.NetworkModificationException.Type.CREATE_GENERATOR_ERROR; -import static org.gridsuite.modification.NetworkModificationException.Type.GENERATOR_ALREADY_EXISTS; import static org.gridsuite.modification.modifications.GeneratorModification.ERROR_MESSAGE; import static org.gridsuite.modification.utils.ModificationUtils.*; @@ -40,9 +38,9 @@ public GeneratorCreation(GeneratorCreationInfos modificationInfos) { } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { if (network.getGenerator(modificationInfos.getEquipmentId()) != null) { - throw new NetworkModificationException(GENERATOR_ALREADY_EXISTS, modificationInfos.getEquipmentId()); + throw new NetworkModificationException("Generator already exists: " + modificationInfos.getEquipmentId()); } String errorMessage = "Generator '" + modificationInfos.getEquipmentId() + "' : "; @@ -52,7 +50,6 @@ public void check(Network network) throws NetworkModificationException { // check reactive limits ModificationUtils.getInstance().checkReactiveLimitsCreation(modificationInfos, - modificationInfos.getErrorType(), modificationInfos.getEquipmentId(), "Generator"); @@ -64,11 +61,11 @@ public void check(Network network) throws NetworkModificationException { modificationInfos.getRegulatingTerminalVlId()); ModificationUtils.getInstance().checkActivePowerControl(modificationInfos.getParticipate(), - modificationInfos.getDroop(), CREATE_GENERATOR_ERROR, String.format(ERROR_MESSAGE, modificationInfos.getEquipmentId())); + modificationInfos.getDroop(), String.format(ERROR_MESSAGE, modificationInfos.getEquipmentId())); - checkIsNotNegativeValue(errorMessage, modificationInfos.getTargetV(), CREATE_GENERATOR_ERROR, "Target Voltage"); - checkIsPercentage(errorMessage, modificationInfos.getDroop(), CREATE_GENERATOR_ERROR, "Droop"); - checkIsNotNegativeValue(errorMessage, modificationInfos.getRatedS(), CREATE_GENERATOR_ERROR, "Rated apparent power"); + checkIsNotNegativeValue(errorMessage, modificationInfos.getTargetV(), "Target Voltage"); + checkIsPercentage(errorMessage, modificationInfos.getDroop(), "Droop"); + checkIsNotNegativeValue(errorMessage, modificationInfos.getRatedS(), "Rated apparent power"); } @Override diff --git a/src/main/java/org/gridsuite/modification/modifications/GeneratorModification.java b/src/main/java/org/gridsuite/modification/modifications/GeneratorModification.java index 84cc4841..7c7841b7 100644 --- a/src/main/java/org/gridsuite/modification/modifications/GeneratorModification.java +++ b/src/main/java/org/gridsuite/modification/modifications/GeneratorModification.java @@ -20,7 +20,6 @@ import java.util.Collection; import java.util.List; -import static org.gridsuite.modification.NetworkModificationException.Type.MODIFY_GENERATOR_ERROR; import static org.gridsuite.modification.utils.ModificationUtils.*; /** @@ -40,9 +39,9 @@ public GeneratorModification(GeneratorModificationInfos modificationInfos) { } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { if (modificationInfos == null) { - throw new NetworkModificationException(MODIFY_GENERATOR_ERROR, "Missing required attributes to modify the equipment"); + throw new NetworkModificationException("Missing required attributes to modify the equipment"); } Generator generator = ModificationUtils.getInstance().getGenerator(network, modificationInfos.getEquipmentId()); // check min max reactive limits @@ -50,7 +49,7 @@ public void check(Network network) throws NetworkModificationException { ModificationUtils.getInstance().checkVoltageLevelModification(network, modificationInfos.getVoltageLevelId(), modificationInfos.getBusOrBusbarSectionId(), generator.getTerminal()); ModificationUtils.getInstance().checkReactiveLimit(generator, modificationInfos.getMinQ(), modificationInfos.getMaxQ(), - modificationInfos.getReactiveCapabilityCurvePoints(), MODIFY_GENERATOR_ERROR, errorMessage); + modificationInfos.getReactiveCapabilityCurvePoints(), errorMessage); // check regulated terminal ModificationUtils.getInstance().checkEnableRegulation( modificationInfos.getVoltageRegulationType(), @@ -60,21 +59,20 @@ public void check(Network network) throws NetworkModificationException { generator.getTerminal(), generator.getRegulatingTerminal(), network, - MODIFY_GENERATOR_ERROR, errorMessage); - checkActivePowerZeroOrBetweenMinAndMaxActivePowerGenerator(modificationInfos, generator, MODIFY_GENERATOR_ERROR, errorMessage); + checkActivePowerZeroOrBetweenMinAndMaxActivePowerGenerator(modificationInfos, generator, errorMessage); if (modificationInfos.getRatedS() != null) { - checkIsNotNegativeValue(errorMessage, modificationInfos.getRatedS().getValue(), MODIFY_GENERATOR_ERROR, "Rated apparent power"); + checkIsNotNegativeValue(errorMessage, modificationInfos.getRatedS().getValue(), "Rated apparent power"); } if (modificationInfos.getDroop() != null) { - checkIsPercentage(errorMessage, modificationInfos.getDroop().getValue(), MODIFY_GENERATOR_ERROR, "Droop"); + checkIsPercentage(errorMessage, modificationInfos.getDroop().getValue(), "Droop"); } if (modificationInfos.getTargetV() != null) { - checkIsNotNegativeValue(errorMessage, modificationInfos.getTargetV().getValue(), MODIFY_GENERATOR_ERROR, "Target Voltage"); + checkIsNotNegativeValue(errorMessage, modificationInfos.getTargetV().getValue(), "Target Voltage"); } } - private void checkActivePowerZeroOrBetweenMinAndMaxActivePowerGenerator(GeneratorModificationInfos modificationInfos, Generator generator, NetworkModificationException.Type exceptionType, String errorMessage) { + private void checkActivePowerZeroOrBetweenMinAndMaxActivePowerGenerator(GeneratorModificationInfos modificationInfos, Generator generator, String errorMessage) { ModificationUtils.getInstance().checkActivePowerZeroOrBetweenMinAndMaxActivePower( modificationInfos.getTargetP(), modificationInfos.getMinP(), @@ -82,7 +80,6 @@ private void checkActivePowerZeroOrBetweenMinAndMaxActivePowerGenerator(Generato generator.getMinP(), generator.getMaxP(), generator.getTargetP(), - exceptionType, errorMessage ); } @@ -190,7 +187,7 @@ private ReportNode modifyGeneratorActivePowerControlAttributes(GeneratorModifica return ModificationUtils.getInstance().modifyActivePowerControlAttributes(activePowerControl, activePowerControlAdder, modificationInfos.getParticipate(), modificationInfos.getDroop(), subReportNode, subReportNodeSetpoints, - MODIFY_GENERATOR_ERROR, String.format(ERROR_MESSAGE, modificationInfos.getEquipmentId())); + String.format(ERROR_MESSAGE, modificationInfos.getEquipmentId())); } private void modifyGeneratorStartUpAttributes(GeneratorModificationInfos modificationInfos, Generator generator, diff --git a/src/main/java/org/gridsuite/modification/modifications/GroovyScript.java b/src/main/java/org/gridsuite/modification/modifications/GroovyScript.java index c4d18b32..cf509d35 100644 --- a/src/main/java/org/gridsuite/modification/modifications/GroovyScript.java +++ b/src/main/java/org/gridsuite/modification/modifications/GroovyScript.java @@ -17,7 +17,6 @@ import org.codehaus.groovy.control.CompilerConfiguration; import org.gridsuite.modification.NetworkModificationException; import org.gridsuite.modification.dto.GroovyScriptInfos; -import static org.gridsuite.modification.NetworkModificationException.Type.GROOVY_SCRIPT_EMPTY; /** * @author Ayoub Labidi @@ -31,9 +30,9 @@ public GroovyScript(GroovyScriptInfos modificationInfos) { } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { if (StringUtils.isBlank(modificationInfos.getScript())) { - throw new NetworkModificationException(GROOVY_SCRIPT_EMPTY); + throw new NetworkModificationException("Groovy script empty"); } } diff --git a/src/main/java/org/gridsuite/modification/modifications/LccCreation.java b/src/main/java/org/gridsuite/modification/modifications/LccCreation.java index 37190b43..f7e75386 100644 --- a/src/main/java/org/gridsuite/modification/modifications/LccCreation.java +++ b/src/main/java/org/gridsuite/modification/modifications/LccCreation.java @@ -25,8 +25,6 @@ import java.util.Optional; import java.util.stream.Stream; -import static org.gridsuite.modification.NetworkModificationException.Type.CREATE_LCC_ERROR; -import static org.gridsuite.modification.NetworkModificationException.Type.HVDC_LINE_ALREADY_EXISTS; import static org.gridsuite.modification.utils.ModificationUtils.createInjectionInNodeBreaker; import static org.gridsuite.modification.utils.ModificationUtils.reportInjectionCreationConnectivity; @@ -45,9 +43,9 @@ public LccCreation(LccCreationInfos modificationInfos) { } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { if (network.getHvdcLine(modificationInfos.getEquipmentId()) != null) { - throw new NetworkModificationException(HVDC_LINE_ALREADY_EXISTS, modificationInfos.getEquipmentId()); + throw new NetworkModificationException("HVDC line already exists: " + modificationInfos.getEquipmentId()); } checkLccConverterStation(network, modificationInfos.getConverterStation1()); checkLccConverterStation(network, modificationInfos.getConverterStation2()); @@ -55,10 +53,10 @@ public void check(Network network) throws NetworkModificationException { private void checkLccConverterStation(Network network, LccConverterStationCreationInfos converterStation) { if (converterStation == null) { - throw new NetworkModificationException(CREATE_LCC_ERROR, modificationInfos.getEquipmentId() + "Missing required converter station"); + throw new NetworkModificationException("Lcc creation error: Missing required converter station: " + modificationInfos.getEquipmentId()); } if (converterStation.getPowerFactor() > 1) { - throw new NetworkModificationException(CREATE_LCC_ERROR, "Loss factor should be less or equal to 1"); + throw new NetworkModificationException("Lcc creation error: Loss factor should be less or equal to 1"); } // check connectivity ModificationUtils.getInstance().controlConnectivity(network, diff --git a/src/main/java/org/gridsuite/modification/modifications/LccModification.java b/src/main/java/org/gridsuite/modification/modifications/LccModification.java index ba2d9b03..8a39e202 100644 --- a/src/main/java/org/gridsuite/modification/modifications/LccModification.java +++ b/src/main/java/org/gridsuite/modification/modifications/LccModification.java @@ -11,7 +11,6 @@ import com.powsybl.commons.report.TypedValue; import com.powsybl.iidm.network.*; import org.apache.commons.math3.util.Pair; -import org.gridsuite.modification.NetworkModificationException; import org.gridsuite.modification.dto.LccConverterStationModificationInfos; import org.gridsuite.modification.dto.LccModificationInfos; import org.gridsuite.modification.dto.LccShuntCompensatorModificationInfos; @@ -59,14 +58,14 @@ private static void modifyCharacteristics(HvdcLine hvdcLine, LccModificationInfo // Nominal Voltage if (modificationInfos.getNominalV() != null) { - ModificationUtils.checkIsNotNegativeValue(errorMessage, modificationInfos.getNominalV().getValue(), NetworkModificationException.Type.MODIFY_LCC_ERROR, "Nominal voltage"); + ModificationUtils.checkIsNotNegativeValue(errorMessage, modificationInfos.getNominalV().getValue(), "Nominal voltage"); characteristicsReportsContainer.add(ModificationUtils.getInstance().applyAndBuildModificationReport(hvdcLine::setNominalV, hvdcLine::getNominalV, modificationInfos.getNominalV(), "DC nominal voltage")); } // DC resistance if (modificationInfos.getR() != null) { - ModificationUtils.checkIsNotNegativeValue(errorMessage, modificationInfos.getR().getValue(), NetworkModificationException.Type.MODIFY_LCC_ERROR, "DC resistance"); + ModificationUtils.checkIsNotNegativeValue(errorMessage, modificationInfos.getR().getValue(), "DC resistance"); characteristicsReportsContainer.add(ModificationUtils.getInstance().applyAndBuildModificationReport(hvdcLine::setR, hvdcLine::getR, modificationInfos.getR(), "DC resistance")); } @@ -139,13 +138,13 @@ private void modifyConverterStation(@Nonnull Network network, } if (converterStationModificationInfos.getLossFactor() != null) { - ModificationUtils.checkIsPercentage(errorMessage, converterStationModificationInfos.getLossFactor().getValue(), NetworkModificationException.Type.MODIFY_LCC_ERROR, "Loss factor"); + ModificationUtils.checkIsPercentage(errorMessage, converterStationModificationInfos.getLossFactor().getValue(), "Loss factor"); characteristicsReports.add(ModificationUtils.getInstance().applyAndBuildModificationReport(converterStation::setLossFactor, converterStation::getLossFactor, converterStationModificationInfos.getLossFactor(), "Loss factor")); } if (converterStationModificationInfos.getPowerFactor() != null) { - ModificationUtils.checkIsInInterval(errorMessage, converterStationModificationInfos.getPowerFactor().getValue(), new Pair<>(0.f, 1.f), NetworkModificationException.Type.MODIFY_LCC_ERROR, "Power factor"); + ModificationUtils.checkIsInInterval(errorMessage, converterStationModificationInfos.getPowerFactor().getValue(), new Pair<>(0.f, 1.f), "Power factor"); characteristicsReports.add(ModificationUtils.getInstance().applyAndBuildModificationReport(converterStation::setPowerFactor, converterStation::getPowerFactor, converterStationModificationInfos.getPowerFactor(), "Power factor")); } diff --git a/src/main/java/org/gridsuite/modification/modifications/LineAttachToVoltageLevel.java b/src/main/java/org/gridsuite/modification/modifications/LineAttachToVoltageLevel.java index 2b55b18b..e9800f6e 100644 --- a/src/main/java/org/gridsuite/modification/modifications/LineAttachToVoltageLevel.java +++ b/src/main/java/org/gridsuite/modification/modifications/LineAttachToVoltageLevel.java @@ -20,7 +20,6 @@ import org.gridsuite.modification.utils.ModificationUtils; import org.gridsuite.modification.utils.PropertiesUtils; -import static org.gridsuite.modification.NetworkModificationException.Type.*; import static org.gridsuite.modification.modifications.LineCreation.addLimits; /** @@ -35,26 +34,26 @@ public LineAttachToVoltageLevel(LineAttachToVoltageLevelInfos modificationInfos) } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { if (network.getLine(modificationInfos.getLineToAttachToId()) == null) { - throw new NetworkModificationException(LINE_NOT_FOUND, modificationInfos.getLineToAttachToId()); + throw new NetworkModificationException("Line not found: " + modificationInfos.getLineToAttachToId()); } LineCreationInfos attachmentLineInfos = modificationInfos.getAttachmentLine(); ModificationUtils.getInstance().controlNewOrExistingVoltageLevel(modificationInfos.getMayNewVoltageLevelInfos(), modificationInfos.getExistingVoltageLevelId(), modificationInfos.getBbsOrBusId(), network); // new fictitious VL if (network.getVoltageLevel(modificationInfos.getAttachmentPointId()) != null) { - throw new NetworkModificationException(VOLTAGE_LEVEL_ALREADY_EXISTS, modificationInfos.getAttachmentPointId()); + throw new NetworkModificationException("Voltage level already exists: " + modificationInfos.getAttachmentPointId()); } // check future lines don't exist if (network.getLine(attachmentLineInfos.getEquipmentId()) != null) { - throw new NetworkModificationException(LINE_ALREADY_EXISTS, attachmentLineInfos.getEquipmentId()); + throw new NetworkModificationException("Line already exists: " + attachmentLineInfos.getEquipmentId()); } if (network.getLine(modificationInfos.getNewLine1Id()) != null) { - throw new NetworkModificationException(LINE_ALREADY_EXISTS, modificationInfos.getNewLine1Id()); + throw new NetworkModificationException("Line already exists: " + modificationInfos.getNewLine1Id()); } if (network.getLine(modificationInfos.getNewLine2Id()) != null) { - throw new NetworkModificationException(LINE_ALREADY_EXISTS, modificationInfos.getNewLine2Id()); + throw new NetworkModificationException("Line already exists: " + modificationInfos.getNewLine2Id()); } } diff --git a/src/main/java/org/gridsuite/modification/modifications/LineCreation.java b/src/main/java/org/gridsuite/modification/modifications/LineCreation.java index 9592e00a..26da0605 100644 --- a/src/main/java/org/gridsuite/modification/modifications/LineCreation.java +++ b/src/main/java/org/gridsuite/modification/modifications/LineCreation.java @@ -22,8 +22,6 @@ import static com.powsybl.iidm.network.TwoSides.ONE; import static com.powsybl.iidm.network.TwoSides.TWO; -import static org.gridsuite.modification.NetworkModificationException.Type.CREATE_LINE_ERROR; -import static org.gridsuite.modification.NetworkModificationException.Type.LINE_ALREADY_EXISTS; import static org.gridsuite.modification.utils.ModificationUtils.checkIsNotNegativeValue; import static org.gridsuite.modification.utils.ModificationUtils.createBranchInNodeBreaker; @@ -39,17 +37,17 @@ public LineCreation(LineCreationInfos modificationInfos) { } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { if (network.getLine(modificationInfos.getEquipmentId()) != null) { - throw new NetworkModificationException(LINE_ALREADY_EXISTS, modificationInfos.getEquipmentId()); + throw new NetworkModificationException("line already exists: " + modificationInfos.getEquipmentId()); } String errorMessage = "Line '" + modificationInfos.getEquipmentId() + "' : "; ModificationUtils.getInstance().controlBranchCreation(network, modificationInfos.getVoltageLevelId1(), modificationInfos.getBusOrBusbarSectionId1(), modificationInfos.getVoltageLevelId2(), modificationInfos.getBusOrBusbarSectionId2()); - checkIsNotNegativeValue(errorMessage, modificationInfos.getR(), CREATE_LINE_ERROR, "Resistance R"); - checkIsNotNegativeValue(errorMessage, modificationInfos.getG1(), CREATE_LINE_ERROR, "Conductance on side 1 G1"); - checkIsNotNegativeValue(errorMessage, modificationInfos.getG2(), CREATE_LINE_ERROR, "Conductance on side 2 G2"); + checkIsNotNegativeValue(errorMessage, modificationInfos.getR(), "Resistance R"); + checkIsNotNegativeValue(errorMessage, modificationInfos.getG1(), "Conductance on side 1 G1"); + checkIsNotNegativeValue(errorMessage, modificationInfos.getG2(), "Conductance on side 2 G2"); } @Override diff --git a/src/main/java/org/gridsuite/modification/modifications/LineModification.java b/src/main/java/org/gridsuite/modification/modifications/LineModification.java index 3560c627..c5d5f1ea 100644 --- a/src/main/java/org/gridsuite/modification/modifications/LineModification.java +++ b/src/main/java/org/gridsuite/modification/modifications/LineModification.java @@ -17,8 +17,6 @@ import org.gridsuite.modification.utils.ModificationUtils; import org.gridsuite.modification.utils.PropertiesUtils; -import static org.gridsuite.modification.NetworkModificationException.Type.LINE_NOT_FOUND; -import static org.gridsuite.modification.NetworkModificationException.Type.MODIFY_LINE_ERROR; import static org.gridsuite.modification.utils.ModificationUtils.checkIsNotNegativeValue; import static org.gridsuite.modification.utils.ModificationUtils.insertReportNode; @@ -36,11 +34,11 @@ public LineModification(LineModificationInfos modificationInfos) { } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { Line line = network.getLine(modificationInfos.getEquipmentId()); String errorMessage = "Line '" + modificationInfos.getEquipmentId() + "' : "; if (line == null) { - throw new NetworkModificationException(LINE_NOT_FOUND, errorMessage + "does not exist in network"); + throw new NetworkModificationException(errorMessage + "does not exist in network"); } ModificationUtils.getInstance().checkVoltageLevelModification(network, modificationInfos.getVoltageLevelId1(), modificationInfos.getBusOrBusbarSectionId1(), line.getTerminal1()); @@ -48,13 +46,13 @@ public void check(Network network) throws NetworkModificationException { modificationInfos.getBusOrBusbarSectionId2(), line.getTerminal2()); LineModificationInfos lineModificationInfos = (LineModificationInfos) modificationInfos; if (lineModificationInfos.getR() != null) { - checkIsNotNegativeValue(errorMessage, lineModificationInfos.getR().getValue(), MODIFY_LINE_ERROR, "Resistance R"); + checkIsNotNegativeValue(errorMessage, lineModificationInfos.getR().getValue(), "Resistance R"); } if (lineModificationInfos.getG1() != null) { - checkIsNotNegativeValue(errorMessage, lineModificationInfos.getG1().getValue(), MODIFY_LINE_ERROR, "Conductance on side 1 G1"); + checkIsNotNegativeValue(errorMessage, lineModificationInfos.getG1().getValue(), "Conductance on side 1 G1"); } if (lineModificationInfos.getG2() != null) { - checkIsNotNegativeValue(errorMessage, lineModificationInfos.getG2().getValue(), MODIFY_LINE_ERROR, "Conductance on side 2 G2"); + checkIsNotNegativeValue(errorMessage, lineModificationInfos.getG2().getValue(), "Conductance on side 2 G2"); } } diff --git a/src/main/java/org/gridsuite/modification/modifications/LineSplitWithVoltageLevel.java b/src/main/java/org/gridsuite/modification/modifications/LineSplitWithVoltageLevel.java index 2cd6e702..8a59eeb9 100644 --- a/src/main/java/org/gridsuite/modification/modifications/LineSplitWithVoltageLevel.java +++ b/src/main/java/org/gridsuite/modification/modifications/LineSplitWithVoltageLevel.java @@ -16,9 +16,6 @@ import org.gridsuite.modification.utils.ModificationUtils; import org.springframework.lang.NonNull; -import static org.gridsuite.modification.NetworkModificationException.Type.LINE_ALREADY_EXISTS; -import static org.gridsuite.modification.NetworkModificationException.Type.LINE_NOT_FOUND; - /** * @author Slimane Amar */ @@ -31,18 +28,18 @@ public LineSplitWithVoltageLevel(LineSplitWithVoltageLevelInfos modificationInfo } @Override - public void check(@NonNull Network network) throws NetworkModificationException { + public void check(@NonNull Network network) { if (network.getLine(modificationInfos.getLineToSplitId()) == null) { - throw new NetworkModificationException(LINE_NOT_FOUND, modificationInfos.getLineToSplitId()); + throw new NetworkModificationException("Line not found: " + modificationInfos.getLineToSplitId()); } ModificationUtils.getInstance().controlNewOrExistingVoltageLevel(modificationInfos.getMayNewVoltageLevelInfos(), modificationInfos.getExistingVoltageLevelId(), modificationInfos.getBbsOrBusId(), network); // check future lines don't exist if (network.getLine(modificationInfos.getNewLine1Id()) != null) { - throw new NetworkModificationException(LINE_ALREADY_EXISTS, modificationInfos.getNewLine1Id()); + throw new NetworkModificationException("Line already exists: " + modificationInfos.getNewLine1Id()); } if (network.getLine(modificationInfos.getNewLine2Id()) != null) { - throw new NetworkModificationException(LINE_ALREADY_EXISTS, modificationInfos.getNewLine2Id()); + throw new NetworkModificationException("Line already exists: " + modificationInfos.getNewLine2Id()); } } diff --git a/src/main/java/org/gridsuite/modification/modifications/LinesAttachToSplitLines.java b/src/main/java/org/gridsuite/modification/modifications/LinesAttachToSplitLines.java index 4dac7b5b..1b589b86 100644 --- a/src/main/java/org/gridsuite/modification/modifications/LinesAttachToSplitLines.java +++ b/src/main/java/org/gridsuite/modification/modifications/LinesAttachToSplitLines.java @@ -15,9 +15,6 @@ import org.gridsuite.modification.dto.LinesAttachToSplitLinesInfos; import org.gridsuite.modification.utils.ModificationUtils; -import static org.gridsuite.modification.NetworkModificationException.Type.LINE_ALREADY_EXISTS; -import static org.gridsuite.modification.NetworkModificationException.Type.LINE_NOT_FOUND; - /** * @author David Braquart */ @@ -30,25 +27,25 @@ public LinesAttachToSplitLines(LinesAttachToSplitLinesInfos modificationInfos) { } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { // check existing lines, vl and busbar if (network.getLine(modificationInfos.getLineToAttachTo1Id()) == null) { - throw new NetworkModificationException(LINE_NOT_FOUND, modificationInfos.getLineToAttachTo1Id()); + throw new NetworkModificationException("Line not found: " + modificationInfos.getLineToAttachTo1Id()); } if (network.getLine(modificationInfos.getLineToAttachTo2Id()) == null) { - throw new NetworkModificationException(LINE_NOT_FOUND, modificationInfos.getLineToAttachTo2Id()); + throw new NetworkModificationException("Line not found: " + modificationInfos.getLineToAttachTo2Id()); } if (network.getLine(modificationInfos.getAttachedLineId()) == null) { - throw new NetworkModificationException(LINE_NOT_FOUND, modificationInfos.getAttachedLineId()); + throw new NetworkModificationException("Line not found: " + modificationInfos.getAttachedLineId()); } VoltageLevel vl = ModificationUtils.getInstance().getVoltageLevel(network, modificationInfos.getVoltageLevelId()); ModificationUtils.getInstance().controlBus(vl, modificationInfos.getBbsBusId()); // check future lines don't exist if (network.getLine(modificationInfos.getReplacingLine1Id()) != null) { - throw new NetworkModificationException(LINE_ALREADY_EXISTS, modificationInfos.getReplacingLine1Id()); + throw new NetworkModificationException("Line already exists: " + modificationInfos.getReplacingLine1Id()); } if (network.getLine(modificationInfos.getReplacingLine2Id()) != null) { - throw new NetworkModificationException(LINE_ALREADY_EXISTS, modificationInfos.getReplacingLine2Id()); + throw new NetworkModificationException("Line already exists: " + modificationInfos.getReplacingLine2Id()); } } diff --git a/src/main/java/org/gridsuite/modification/modifications/LoadCreation.java b/src/main/java/org/gridsuite/modification/modifications/LoadCreation.java index 821fe26b..23602f7e 100644 --- a/src/main/java/org/gridsuite/modification/modifications/LoadCreation.java +++ b/src/main/java/org/gridsuite/modification/modifications/LoadCreation.java @@ -14,7 +14,6 @@ import org.gridsuite.modification.utils.ModificationUtils; import org.gridsuite.modification.utils.PropertiesUtils; -import static org.gridsuite.modification.NetworkModificationException.Type.LOAD_ALREADY_EXISTS; import static org.gridsuite.modification.utils.ModificationUtils.createInjectionInNodeBreaker; /** @@ -29,9 +28,9 @@ public LoadCreation(LoadCreationInfos modificationInfos) { } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { if (network.getLoad(modificationInfos.getEquipmentId()) != null) { - throw new NetworkModificationException(LOAD_ALREADY_EXISTS, modificationInfos.getEquipmentId()); + throw new NetworkModificationException("Load already exists: " + modificationInfos.getEquipmentId()); } ModificationUtils.getInstance().controlConnectivity(network, modificationInfos.getVoltageLevelId(), modificationInfos.getBusOrBusbarSectionId()); diff --git a/src/main/java/org/gridsuite/modification/modifications/LoadModification.java b/src/main/java/org/gridsuite/modification/modifications/LoadModification.java index 5d4a8fba..38e3b8bd 100644 --- a/src/main/java/org/gridsuite/modification/modifications/LoadModification.java +++ b/src/main/java/org/gridsuite/modification/modifications/LoadModification.java @@ -18,8 +18,6 @@ import org.gridsuite.modification.utils.ModificationUtils; import org.gridsuite.modification.utils.PropertiesUtils; -import static org.gridsuite.modification.NetworkModificationException.Type.LOAD_NOT_FOUND; - /** * @author Ayoub Labidi */ @@ -30,11 +28,10 @@ public LoadModification(LoadModificationInfos modificationInfos) { } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { Load load = network.getLoad(modificationInfos.getEquipmentId()); if (load == null) { - throw new NetworkModificationException(LOAD_NOT_FOUND, - "Load " + modificationInfos.getEquipmentId() + " does not exist in network"); + throw new NetworkModificationException("Load " + modificationInfos.getEquipmentId() + " does not exist in network"); } ModificationUtils.getInstance().checkVoltageLevelModification(network, modificationInfos.getVoltageLevelId(), modificationInfos.getBusOrBusbarSectionId(), load.getTerminal()); diff --git a/src/main/java/org/gridsuite/modification/modifications/LoadScaling.java b/src/main/java/org/gridsuite/modification/modifications/LoadScaling.java index 170e7325..869e2023 100644 --- a/src/main/java/org/gridsuite/modification/modifications/LoadScaling.java +++ b/src/main/java/org/gridsuite/modification/modifications/LoadScaling.java @@ -106,13 +106,13 @@ protected void applyProportionalVariation(Network network, ReportNode subReportN @Override protected void applyProportionalToPmaxVariation(Network network, ReportNode subReportNode, Set identifiableAttributes, ScalingVariationInfos scalingVariationInfos) { // no implementation for load scaling - throw new NetworkModificationException(scalingInfos.getErrorType(), String.format("This variation mode is not supported : %s", scalingVariationInfos.getVariationMode().name())); + throw new NetworkModificationException(String.format("This variation mode is not supported : %s", scalingVariationInfos.getVariationMode().name())); } @Override protected void applyStackingUpVariation(Network network, ReportNode subReportNode, Set identifiableAttributes, ScalingVariationInfos scalingVariationInfos) { // no implementation for load scaling - throw new NetworkModificationException(scalingInfos.getErrorType(), String.format("This variation mode is not supported : %s", scalingVariationInfos.getVariationMode().name())); + throw new NetworkModificationException(String.format("This variation mode is not supported : %s", scalingVariationInfos.getVariationMode().name())); } private double scale(Network network, ScalingVariationInfos scalingVariationInfos, double asked, Scalable proportionalScalable) { diff --git a/src/main/java/org/gridsuite/modification/modifications/MoveVoltageLevelFeederBays.java b/src/main/java/org/gridsuite/modification/modifications/MoveVoltageLevelFeederBays.java index 305b01d8..8d397a76 100644 --- a/src/main/java/org/gridsuite/modification/modifications/MoveVoltageLevelFeederBays.java +++ b/src/main/java/org/gridsuite/modification/modifications/MoveVoltageLevelFeederBays.java @@ -18,8 +18,6 @@ import java.util.function.Consumer; -import static org.gridsuite.modification.NetworkModificationException.Type.MOVE_VOLTAGE_LEVEL_FEEDER_BAYS_ERROR; - /** * @author Etienne Lesot */ @@ -36,7 +34,7 @@ public MoveVoltageLevelFeederBays(MoveVoltageLevelFeederBaysInfos modificationIn } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { VoltageLevel voltageLevel = getVoltageLevelOrThrow(network, modificationInfos.getVoltageLevelId()); for (MoveFeederBayInfos info : modificationInfos.getFeederBays()) { checkBusOrBusbarSectionExist(voltageLevel, info); @@ -47,7 +45,7 @@ public void check(Network network) throws NetworkModificationException { private VoltageLevel getVoltageLevelOrThrow(Network network, String voltageLevelId) { VoltageLevel voltageLevel = network.getVoltageLevel(voltageLevelId); if (voltageLevel == null) { - throw new NetworkModificationException(MOVE_VOLTAGE_LEVEL_FEEDER_BAYS_ERROR, String.format(VOLTAGE_LEVEL_NOT_FOUND, voltageLevelId)); + throw new NetworkModificationException(String.format(VOLTAGE_LEVEL_NOT_FOUND, voltageLevelId)); } return voltageLevel; } @@ -57,7 +55,7 @@ private void checkBusOrBusbarSectionExist(VoltageLevel voltageLevel, MoveFeederB ? voltageLevel.getNodeBreakerView().getBusbarSection(info.getBusbarSectionId()) != null : voltageLevel.getBusBreakerView().getBus(info.getBusbarSectionId()) != null; if (!busOrBusbarSectionExists) { - throw new NetworkModificationException(MOVE_VOLTAGE_LEVEL_FEEDER_BAYS_ERROR, String.format(BUSBAR_NOT_FOUND, + throw new NetworkModificationException(String.format(BUSBAR_NOT_FOUND, info.getBusbarSectionId(), info.getEquipmentId(), modificationInfos.getVoltageLevelId())); } } @@ -65,7 +63,7 @@ private void checkBusOrBusbarSectionExist(VoltageLevel voltageLevel, MoveFeederB private void checkConnectable(Network network, MoveFeederBayInfos info) { Connectable connectable = network.getConnectable(info.getEquipmentId()); if (connectable instanceof BusbarSection || connectable instanceof ThreeWindingsTransformer) { - throw new NetworkModificationException(MOVE_VOLTAGE_LEVEL_FEEDER_BAYS_ERROR, String.format(UNSUPPORTED_CONNECTABLE, connectable.getClass())); + throw new NetworkModificationException(String.format(UNSUPPORTED_CONNECTABLE, connectable.getClass())); } } @@ -103,7 +101,7 @@ private void modifyConnectablePosition(Network network, Connectable connectab BranchModificationInfos branchModificationInfos = buildBranchModificationInfos(newConnectablePositionInfos); ModificationUtils.getInstance().modifyBranchConnectivityAttributes(oldConnectablePosition, connectablePositionAdder, branch, branchModificationInfos, subReportNode); } - default -> throw new NetworkModificationException(MOVE_VOLTAGE_LEVEL_FEEDER_BAYS_ERROR, String.format(UNSUPPORTED_CONNECTABLE, connectable.getClass())); + default -> throw new NetworkModificationException(String.format(UNSUPPORTED_CONNECTABLE, connectable.getClass())); } moveFeederBay(network, connectable, newConnectablePositionInfos, subReportNode); } @@ -131,7 +129,7 @@ private BranchModificationInfos buildBranchModificationInfos(MoveFeederBayInfos branchInfos::setConnectionName2, branchInfos::setConnectionDirection2, info); - default -> throw new NetworkModificationException(MOVE_VOLTAGE_LEVEL_FEEDER_BAYS_ERROR, String.format(INVALID_CONNECTION_SIDE, info.getConnectionSide(), branchInfos.getEquipmentId())); + default -> throw new NetworkModificationException(String.format(INVALID_CONNECTION_SIDE, info.getConnectionSide(), branchInfos.getEquipmentId())); } return branchInfos; } @@ -173,11 +171,10 @@ public Terminal getTerminal(Network network, MoveFeederBayInfos info) { TwoSides side = TwoSides.valueOf(info.getConnectionSide()); yield branch.getTerminal(side); } catch (IllegalArgumentException e) { - throw new NetworkModificationException(MOVE_VOLTAGE_LEVEL_FEEDER_BAYS_ERROR, - String.format(INVALID_CONNECTION_SIDE, info.getConnectionSide(), branch.getId())); + throw new NetworkModificationException(String.format(INVALID_CONNECTION_SIDE, info.getConnectionSide(), branch.getId())); } } - default -> throw new NetworkModificationException(MOVE_VOLTAGE_LEVEL_FEEDER_BAYS_ERROR, String.format(UNSUPPORTED_CONNECTABLE, connectable.getClass())); + default -> throw new NetworkModificationException(String.format(UNSUPPORTED_CONNECTABLE, connectable.getClass())); }; } } diff --git a/src/main/java/org/gridsuite/modification/modifications/OperatingStatusModification.java b/src/main/java/org/gridsuite/modification/modifications/OperatingStatusModification.java index b06533bf..33244b0e 100644 --- a/src/main/java/org/gridsuite/modification/modifications/OperatingStatusModification.java +++ b/src/main/java/org/gridsuite/modification/modifications/OperatingStatusModification.java @@ -27,8 +27,6 @@ import java.util.Objects; import java.util.function.Predicate; -import static org.gridsuite.modification.NetworkModificationException.Type.EQUIPMENT_NOT_FOUND; -import static org.gridsuite.modification.NetworkModificationException.Type.OPERATING_STATUS_MODIFICATION_ERROR; import static org.gridsuite.modification.utils.ModificationUtils.distinctByKey; /** @@ -46,11 +44,11 @@ public OperatingStatusModification(OperatingStatusModificationInfos modification } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { String equipmentId = modificationInfos.getEquipmentId(); Identifiable equipment = network.getIdentifiable(equipmentId); if (equipment == null) { - throw new NetworkModificationException(EQUIPMENT_NOT_FOUND, equipmentId); + throw new NetworkModificationException("Equipment not found: " + equipmentId); } } @@ -59,7 +57,7 @@ public void apply(Network network, ReportNode subReportNode) { String equipmentId = modificationInfos.getEquipmentId(); Identifiable equipment = network.getIdentifiable(equipmentId); if (equipment == null) { - throw new NetworkModificationException(EQUIPMENT_NOT_FOUND, equipmentId); + throw new NetworkModificationException("Equipment not found: " + equipmentId); } String equipmentType = String.valueOf(equipment.getType()); @@ -72,7 +70,7 @@ public void apply(Network network, ReportNode subReportNode) { case ENERGISE_END_TWO -> applyEnergiseEquipmentEnd(subReportNode, equipment, equipmentType, TwoSides.TWO); default -> - throw NetworkModificationException.createOperatingActionTypeUnsupported(modificationInfos.getAction()); + throw new NetworkModificationException("The operating action type : " + modificationInfos.getAction() + " is unsupported"); } } @@ -85,7 +83,7 @@ private void applyLockoutEquipment(ReportNode subReportNode, Identifiable equ if (disconnectAllTerminals(equipment)) { equipment.newExtension(OperatingStatusAdder.class).withStatus(OperatingStatus.Status.PLANNED_OUTAGE).add(); } else { - throw new NetworkModificationException(OPERATING_STATUS_MODIFICATION_ERROR, "Unable to disconnect all equipment ends"); + throw new NetworkModificationException("Unable to disconnect all equipment ends"); } subReportNode.newReportNode() .withMessageTemplate("network.modification.lockout.equipment.Applied") @@ -128,13 +126,13 @@ private void applyTripEquipment(ReportNode subReportNode, Identifiable equipm private void applySwitchOnEquipment(ReportNode subReportNode, Identifiable equipment, String equipmentType) { if (!(equipment instanceof Branch)) { - throw NetworkModificationException.createEquipmentTypeNotSupported(equipment.getClass().getSimpleName()); + throw new NetworkModificationException("The equipment type : " + equipment.getClass().getSimpleName() + " is not supported"); } if (connectAllTerminals(equipment)) { equipment.newExtension(OperatingStatusAdder.class).withStatus(OperatingStatus.Status.IN_OPERATION).add(); } else { - throw new NetworkModificationException(OPERATING_STATUS_MODIFICATION_ERROR, "Unable to connect all equipment ends"); + throw new NetworkModificationException("Unable to connect all equipment ends"); } subReportNode.newReportNode() @@ -147,14 +145,14 @@ private void applySwitchOnEquipment(ReportNode subReportNode, Identifiable eq private void applyEnergiseEquipmentEnd(ReportNode subReportNode, Identifiable equipment, String equipmentType, TwoSides side) { if (!(equipment instanceof Branch branch)) { - throw NetworkModificationException.createEquipmentTypeNotSupported(equipment.getClass().getSimpleName()); + throw new NetworkModificationException("The equipment type : " + equipment.getClass().getSimpleName() + " is not supported"); } TwoSides oppositeSide = side == TwoSides.ONE ? TwoSides.TWO : TwoSides.ONE; if (connectOneTerminal(branch.getTerminal(side)) && disconnectOneTerminal(branch.getTerminal(oppositeSide), SwitchPredicates.IS_CLOSED_BREAKER)) { branch.newExtension(OperatingStatusAdder.class).withStatus(OperatingStatus.Status.IN_OPERATION).add(); } else { - throw new NetworkModificationException(OPERATING_STATUS_MODIFICATION_ERROR, "Unable to energise equipment end"); + throw new NetworkModificationException("Unable to energise equipment end"); } subReportNode.newReportNode() @@ -192,6 +190,6 @@ public Tripping getTrippingFromIdentifiable(Identifiable identifiable) { } else if (identifiable instanceof HvdcLine hvdcLine) { return new HvdcLineTripping(hvdcLine.getId()); } - throw NetworkModificationException.createEquipmentTypeNotSupported(identifiable.getClass().getSimpleName()); + throw new NetworkModificationException("The equipment type : " + identifiable.getClass().getSimpleName() + " is not supported"); } } diff --git a/src/main/java/org/gridsuite/modification/modifications/ShuntCompensatorCreation.java b/src/main/java/org/gridsuite/modification/modifications/ShuntCompensatorCreation.java index 7931eed2..8d61f20c 100644 --- a/src/main/java/org/gridsuite/modification/modifications/ShuntCompensatorCreation.java +++ b/src/main/java/org/gridsuite/modification/modifications/ShuntCompensatorCreation.java @@ -15,8 +15,6 @@ import org.gridsuite.modification.utils.ModificationUtils; import org.gridsuite.modification.utils.PropertiesUtils; -import static org.gridsuite.modification.NetworkModificationException.Type.CREATE_SHUNT_COMPENSATOR_ERROR; -import static org.gridsuite.modification.NetworkModificationException.Type.SHUNT_COMPENSATOR_ALREADY_EXISTS; import static org.gridsuite.modification.utils.ModificationUtils.createInjectionInNodeBreaker; /** @@ -31,17 +29,17 @@ public ShuntCompensatorCreation(ShuntCompensatorCreationInfos modificationInfos) } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { if (network.getShuntCompensator(modificationInfos.getEquipmentId()) != null) { - throw new NetworkModificationException(SHUNT_COMPENSATOR_ALREADY_EXISTS, modificationInfos.getEquipmentId()); + throw new NetworkModificationException("Shunt compensator already exists: " + modificationInfos.getEquipmentId()); } if (modificationInfos.getMaximumSectionCount() < 1) { - throw new NetworkModificationException(CREATE_SHUNT_COMPENSATOR_ERROR, "Maximum section count should be greater or equal to 1"); + throw new NetworkModificationException("Maximum section count should be greater or equal to 1"); } if (modificationInfos.getSectionCount() < 0 || modificationInfos.getSectionCount() > modificationInfos.getMaximumSectionCount()) { - throw new NetworkModificationException(CREATE_SHUNT_COMPENSATOR_ERROR, String.format("Section count should be between 0 and Maximum section count (%d), actual : %d", + throw new NetworkModificationException(String.format("Section count should be between 0 and Maximum section count (%d), actual : %d", modificationInfos.getMaximumSectionCount(), modificationInfos.getSectionCount())); } diff --git a/src/main/java/org/gridsuite/modification/modifications/ShuntCompensatorModification.java b/src/main/java/org/gridsuite/modification/modifications/ShuntCompensatorModification.java index bc153857..ab42e176 100644 --- a/src/main/java/org/gridsuite/modification/modifications/ShuntCompensatorModification.java +++ b/src/main/java/org/gridsuite/modification/modifications/ShuntCompensatorModification.java @@ -22,8 +22,6 @@ import java.util.ArrayList; import java.util.List; -import static org.gridsuite.modification.NetworkModificationException.Type.MODIFY_SHUNT_COMPENSATOR_ERROR; -import static org.gridsuite.modification.NetworkModificationException.Type.SHUNT_COMPENSATOR_NOT_FOUND; import static org.gridsuite.modification.utils.ModificationUtils.insertReportNode; /** @@ -40,11 +38,10 @@ public ShuntCompensatorModification(ShuntCompensatorModificationInfos shuntCompe } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { ShuntCompensator shuntCompensator = network.getShuntCompensator(modificationInfos.getEquipmentId()); if (shuntCompensator == null) { - throw new NetworkModificationException(SHUNT_COMPENSATOR_NOT_FOUND, - String.format("Shunt compensator %s does not exist in network", modificationInfos.getEquipmentId())); + throw new NetworkModificationException(String.format("Shunt compensator %s does not exist in network", modificationInfos.getEquipmentId())); } ModificationUtils.getInstance().checkVoltageLevelModification(network, modificationInfos.getVoltageLevelId(), modificationInfos.getBusOrBusbarSectionId(), shuntCompensator.getTerminal()); @@ -57,11 +54,11 @@ public void check(Network network) throws NetworkModificationException { : shuntCompensator.getSectionCount(); if (modificationInfos.getMaximumSectionCount() != null && modificationInfos.getMaximumSectionCount().getValue() < 1) { - throw new NetworkModificationException(MODIFY_SHUNT_COMPENSATOR_ERROR, "Maximum section count should be greater or equal to 1"); + throw new NetworkModificationException("Unable to modify shunt compensator: Maximum section count should be greater or equal to 1"); } if (sectionCount < 0 || maximumSectionCount < 1 || sectionCount > maximumSectionCount) { - throw new NetworkModificationException(MODIFY_SHUNT_COMPENSATOR_ERROR, String.format("Section count should be between 0 and Maximum section count (%d), actual : %d", maximumSectionCount, sectionCount)); + throw new NetworkModificationException(String.format("Unable to modify shunt compensator: Section count should be between 0 and Maximum section count (%d), actual : %d", maximumSectionCount, sectionCount)); } } @@ -195,8 +192,7 @@ public static void modifyMaximumQAtNominalVoltage(AttributeModification ShuntCompensatorLinearModel model, ShuntCompensatorType shuntCompensatorType) { if (maxQAtNominalV.getValue() < 0) { - throw new NetworkModificationException(NetworkModificationException.Type.MODIFY_SHUNT_COMPENSATOR_ERROR, - "Qmax at nominal voltage should be greater or equal to 0"); + throw new NetworkModificationException("Unable to modify shunt compensator: Qmax at nominal voltage should be greater or equal to 0"); } double newQatNominalV = maxQAtNominalV.getValue() / maximumSectionCount; double newSusceptancePerSection = newQatNominalV / Math.pow(voltageLevel.getNominalV(), 2); diff --git a/src/main/java/org/gridsuite/modification/modifications/StaticVarCompensatorCreation.java b/src/main/java/org/gridsuite/modification/modifications/StaticVarCompensatorCreation.java index 4fa0abc1..df08fe03 100644 --- a/src/main/java/org/gridsuite/modification/modifications/StaticVarCompensatorCreation.java +++ b/src/main/java/org/gridsuite/modification/modifications/StaticVarCompensatorCreation.java @@ -21,8 +21,6 @@ import java.util.List; import java.util.Objects; -import static org.gridsuite.modification.NetworkModificationException.Type.CREATE_STATIC_VAR_COMPENSATOR_ERROR; -import static org.gridsuite.modification.NetworkModificationException.Type.STATIC_VAR_COMPENSATOR_ALREADY_EXISTS; import static org.gridsuite.modification.utils.ModificationUtils.*; /** @@ -37,9 +35,9 @@ public StaticVarCompensatorCreation(StaticVarCompensatorCreationInfos modificati } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { if (network.getStaticVarCompensator(modificationInfos.getEquipmentId()) != null) { - throw new NetworkModificationException(STATIC_VAR_COMPENSATOR_ALREADY_EXISTS, modificationInfos.getEquipmentId()); + throw new NetworkModificationException("static var compensator already exists: " + modificationInfos.getEquipmentId()); } String errorMessage = "Static var compensator '" + modificationInfos.getEquipmentId() + "' : "; @@ -58,11 +56,11 @@ public void check(Network network) throws NetworkModificationException { // check standby automaton ModificationUtils.getInstance().checkStandbyAutomatonCreation(modificationInfos); - checkIsNotNegativeValue(errorMessage, modificationInfos.getVoltageSetpoint(), CREATE_STATIC_VAR_COMPENSATOR_ERROR, "voltage set point"); - checkIsNotNegativeValue(errorMessage, modificationInfos.getHighVoltageSetpoint(), CREATE_STATIC_VAR_COMPENSATOR_ERROR, "high voltage set point"); - checkIsNotNegativeValue(errorMessage, modificationInfos.getLowVoltageSetpoint(), CREATE_STATIC_VAR_COMPENSATOR_ERROR, "low voltage set point"); - checkIsNotNegativeValue(errorMessage, modificationInfos.getHighVoltageThreshold(), CREATE_STATIC_VAR_COMPENSATOR_ERROR, "high voltage threshold"); - checkIsNotNegativeValue(errorMessage, modificationInfos.getLowVoltageThreshold(), CREATE_STATIC_VAR_COMPENSATOR_ERROR, "low voltage threshold"); + checkIsNotNegativeValue(errorMessage, modificationInfos.getVoltageSetpoint(), "voltage set point"); + checkIsNotNegativeValue(errorMessage, modificationInfos.getHighVoltageSetpoint(), "high voltage set point"); + checkIsNotNegativeValue(errorMessage, modificationInfos.getLowVoltageSetpoint(), "low voltage set point"); + checkIsNotNegativeValue(errorMessage, modificationInfos.getHighVoltageThreshold(), "high voltage threshold"); + checkIsNotNegativeValue(errorMessage, modificationInfos.getLowVoltageThreshold(), "low voltage threshold"); } @Override diff --git a/src/main/java/org/gridsuite/modification/modifications/SubstationModification.java b/src/main/java/org/gridsuite/modification/modifications/SubstationModification.java index 223ec884..15e3abdd 100644 --- a/src/main/java/org/gridsuite/modification/modifications/SubstationModification.java +++ b/src/main/java/org/gridsuite/modification/modifications/SubstationModification.java @@ -15,8 +15,6 @@ import org.gridsuite.modification.utils.ModificationUtils; import org.gridsuite.modification.utils.PropertiesUtils; -import static org.gridsuite.modification.NetworkModificationException.Type.SUBSTATION_NOT_FOUND; - /* * @author David Braquart */ @@ -29,11 +27,10 @@ public SubstationModification(SubstationModificationInfos modificationInfos) { } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { Substation station = network.getSubstation(modificationInfos.getEquipmentId()); if (station == null) { - throw new NetworkModificationException(SUBSTATION_NOT_FOUND, - "Substation " + modificationInfos.getEquipmentId() + " does not exist in network"); + throw new NetworkModificationException("Substation " + modificationInfos.getEquipmentId() + " does not exist in network"); } } diff --git a/src/main/java/org/gridsuite/modification/modifications/TwoWindingsTransformerCreation.java b/src/main/java/org/gridsuite/modification/modifications/TwoWindingsTransformerCreation.java index b904aed8..d46f3a65 100644 --- a/src/main/java/org/gridsuite/modification/modifications/TwoWindingsTransformerCreation.java +++ b/src/main/java/org/gridsuite/modification/modifications/TwoWindingsTransformerCreation.java @@ -22,7 +22,6 @@ import static com.powsybl.iidm.network.TwoSides.ONE; import static com.powsybl.iidm.network.TwoSides.TWO; -import static org.gridsuite.modification.NetworkModificationException.Type.*; import static org.gridsuite.modification.dto.OperationalLimitsGroupInfos.Applicability.SIDE1; import static org.gridsuite.modification.dto.OperationalLimitsGroupInfos.Applicability.SIDE2; import static org.gridsuite.modification.utils.ModificationUtils.*; @@ -35,22 +34,22 @@ public TwoWindingsTransformerCreation(TwoWindingsTransformerCreationInfos modifi } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { if (network.getTwoWindingsTransformer(modificationInfos.getEquipmentId()) != null) { - throw new NetworkModificationException(TWO_WINDINGS_TRANSFORMER_ALREADY_EXISTS, modificationInfos.getEquipmentId()); + throw new NetworkModificationException("Two winding transformer already exists: " + modificationInfos.getEquipmentId()); } String errorMessage = "Two windings transformer '" + modificationInfos.getEquipmentId() + "' : "; getInstance().controlBranchCreation(network, modificationInfos.getVoltageLevelId1(), modificationInfos.getBusOrBusbarSectionId1(), modificationInfos.getVoltageLevelId2(), modificationInfos.getBusOrBusbarSectionId2()); - checkIsNotNegativeValue(errorMessage, modificationInfos.getR(), CREATE_TWO_WINDINGS_TRANSFORMER_ERROR, "Resistance R"); - checkIsNotNegativeValue(errorMessage, modificationInfos.getG(), CREATE_TWO_WINDINGS_TRANSFORMER_ERROR, "Conductance G"); - checkIsNotNegativeValue(errorMessage, modificationInfos.getRatedU1(), CREATE_TWO_WINDINGS_TRANSFORMER_ERROR, "Rated Voltage on side 1"); - checkIsNotNegativeValue(errorMessage, modificationInfos.getRatedU2(), CREATE_TWO_WINDINGS_TRANSFORMER_ERROR, "Rated Voltage on side 2"); - checkIsNotNegativeValue(errorMessage, modificationInfos.getRatedS(), CREATE_TWO_WINDINGS_TRANSFORMER_ERROR, "Rated nominal power"); + checkIsNotNegativeValue(errorMessage, modificationInfos.getR(), "Resistance R"); + checkIsNotNegativeValue(errorMessage, modificationInfos.getG(), "Conductance G"); + checkIsNotNegativeValue(errorMessage, modificationInfos.getRatedU1(), "Rated Voltage on side 1"); + checkIsNotNegativeValue(errorMessage, modificationInfos.getRatedU2(), "Rated Voltage on side 2"); + checkIsNotNegativeValue(errorMessage, modificationInfos.getRatedS(), "Rated nominal power"); if (modificationInfos.getRatioTapChanger() != null) { checkIsNotNegativeValue(errorMessage, modificationInfos.getRatioTapChanger().getTargetV(), - CREATE_TWO_WINDINGS_TRANSFORMER_ERROR, "Target voltage for ratio tap changer"); + "Target voltage for ratio tap changer"); } } @@ -98,7 +97,7 @@ private TwoWindingsTransformerAdder createTwoWindingsTransformerAdder(VoltageLev } else if (s2 != null) { branchAdder = s2.newTwoWindingsTransformer(); } else { - throw new NetworkModificationException(TWO_WINDINGS_TRANSFORMER_CREATION_ERROR, "The two windings transformer should belong to a substation"); + throw new NetworkModificationException("The two windings transformer should belong to a substation"); } // common settings TwoWindingsTransformerAdder twoWindingsTransformerAdder = branchAdder.setId(twoWindingsTransformerCreationInfos.getEquipmentId()) diff --git a/src/main/java/org/gridsuite/modification/modifications/TwoWindingsTransformerModification.java b/src/main/java/org/gridsuite/modification/modifications/TwoWindingsTransformerModification.java index a204af22..c621aa5d 100644 --- a/src/main/java/org/gridsuite/modification/modifications/TwoWindingsTransformerModification.java +++ b/src/main/java/org/gridsuite/modification/modifications/TwoWindingsTransformerModification.java @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.List; -import static org.gridsuite.modification.NetworkModificationException.Type.*; import static org.gridsuite.modification.utils.ModificationUtils.checkIsNotNegativeValue; import static org.gridsuite.modification.utils.ModificationUtils.insertReportNode; @@ -38,11 +37,11 @@ public TwoWindingsTransformerModification(TwoWindingsTransformerModificationInfo } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { String errorMessage = "Two windings transformer '" + modificationInfos.getEquipmentId() + "' : "; TwoWindingsTransformer transformer = network.getTwoWindingsTransformer(modificationInfos.getEquipmentId()); if (transformer == null) { - throw new NetworkModificationException(TWO_WINDINGS_TRANSFORMER_NOT_FOUND, errorMessage + "it does not exist in the network"); + throw new NetworkModificationException(errorMessage + "it does not exist in the network"); } ModificationUtils.getInstance().checkVoltageLevelModification(network, modificationInfos.getVoltageLevelId1(), modificationInfos.getBusOrBusbarSectionId1(), transformer.getTerminal1()); @@ -52,23 +51,22 @@ public void check(Network network) throws NetworkModificationException { checkAndModifyTapChanger(network, twtModificationInfos.getRatioTapChanger(), transformer.getRatioTapChanger(), errorMessage); checkAndModifyTapChanger(network, twtModificationInfos.getPhaseTapChanger(), transformer.getPhaseTapChanger(), errorMessage); if (twtModificationInfos.getR() != null) { - checkIsNotNegativeValue(errorMessage, twtModificationInfos.getR().getValue(), MODIFY_TWO_WINDINGS_TRANSFORMER_ERROR, "Resistance R"); + checkIsNotNegativeValue(errorMessage, twtModificationInfos.getR().getValue(), "Resistance R"); } if (twtModificationInfos.getG() != null) { - checkIsNotNegativeValue(errorMessage, twtModificationInfos.getG().getValue(), MODIFY_TWO_WINDINGS_TRANSFORMER_ERROR, "Conductance G"); + checkIsNotNegativeValue(errorMessage, twtModificationInfos.getG().getValue(), "Conductance G"); } if (twtModificationInfos.getRatedU1() != null) { - checkIsNotNegativeValue(errorMessage, twtModificationInfos.getRatedU1().getValue(), MODIFY_TWO_WINDINGS_TRANSFORMER_ERROR, "Rated Voltage on side 1"); + checkIsNotNegativeValue(errorMessage, twtModificationInfos.getRatedU1().getValue(), "Rated Voltage on side 1"); } if (twtModificationInfos.getRatedU2() != null) { - checkIsNotNegativeValue(errorMessage, twtModificationInfos.getRatedU2().getValue(), MODIFY_TWO_WINDINGS_TRANSFORMER_ERROR, "Rated Voltage on side 2"); + checkIsNotNegativeValue(errorMessage, twtModificationInfos.getRatedU2().getValue(), "Rated Voltage on side 2"); } if (twtModificationInfos.getRatedS() != null) { - checkIsNotNegativeValue(errorMessage, twtModificationInfos.getRatedS().getValue(), MODIFY_TWO_WINDINGS_TRANSFORMER_ERROR, "Rated nominal power"); + checkIsNotNegativeValue(errorMessage, twtModificationInfos.getRatedS().getValue(), "Rated nominal power"); } if (twtModificationInfos.getRatioTapChanger() != null && twtModificationInfos.getRatioTapChanger().getTargetV() != null) { - checkIsNotNegativeValue(errorMessage, twtModificationInfos.getRatioTapChanger().getTargetV().getValue(), - MODIFY_TWO_WINDINGS_TRANSFORMER_ERROR, "Target voltage for ratio tap changer"); + checkIsNotNegativeValue(errorMessage, twtModificationInfos.getRatioTapChanger().getTargetV().getValue(), "Target voltage for ratio tap changer"); } } @@ -86,7 +84,7 @@ private void checkTapChangerModification(Network network, TapChangerModification null, tapChanger.getRegulationTerminal(), network, - MODIFY_TWO_WINDINGS_TRANSFORMER_ERROR, errorMessage); + errorMessage); } @Override @@ -321,7 +319,7 @@ public static void processPhaseTapRegulation(PhaseTapChanger phaseTapChanger, AttributeModification regulationValueModification, AttributeModification targetDeadbandModification, AttributeModification regulatingModification, - List regulationReports) throws NetworkModificationException { + List regulationReports) { // checks will be done in powsybl AttributeModification finalTargetDeadbandModification = targetDeadbandModification; @@ -332,10 +330,10 @@ public static void processPhaseTapRegulation(PhaseTapChanger phaseTapChanger, finalTargetDeadbandModification = new AttributeModification<>(0.0, OperationType.SET); } if (regulationValueModification == null) { - throw new NetworkModificationException(CREATE_TWO_WINDINGS_TRANSFORMER_ERROR, "Regulation value is missing when creating tap phase changer with regulation enabled"); + throw new NetworkModificationException("Two winding transformer creation error: Regulation value is missing when creating tap phase changer with regulation enabled"); } if (regulationModeModification == null) { - throw new NetworkModificationException(CREATE_TWO_WINDINGS_TRANSFORMER_ERROR, "Regulation mode is missing when creating tap phase changer with regulation enabled"); + throw new NetworkModificationException("Two winding transformer creation error: Regulation mode is missing when creating tap phase changer with regulation enabled"); } } else { @@ -344,10 +342,10 @@ public static void processPhaseTapRegulation(PhaseTapChanger phaseTapChanger, } if (regulationValueModification == null && Double.isNaN(phaseTapChanger.getRegulationValue())) { - throw new NetworkModificationException(MODIFY_TWO_WINDINGS_TRANSFORMER_ERROR, "Regulation value is missing when modifying, phase tap changer can not regulate"); + throw new NetworkModificationException("Two winding transformer modification error: Regulation value is missing when modifying, phase tap changer can not regulate"); } if (regulationModeModification == null && phaseTapChanger.getRegulationMode() == null) { - throw new NetworkModificationException(MODIFY_TWO_WINDINGS_TRANSFORMER_ERROR, "Regulation mode is missing when modifying, phase tap changer can not regulate"); + throw new NetworkModificationException("Two winding transformer modification error: Regulation mode is missing when modifying, phase tap changer can not regulate"); } } } diff --git a/src/main/java/org/gridsuite/modification/modifications/VoltageInitModification.java b/src/main/java/org/gridsuite/modification/modifications/VoltageInitModification.java index 03cb6e28..df05fbf4 100644 --- a/src/main/java/org/gridsuite/modification/modifications/VoltageInitModification.java +++ b/src/main/java/org/gridsuite/modification/modifications/VoltageInitModification.java @@ -12,7 +12,6 @@ import com.powsybl.iidm.network.*; import lombok.AllArgsConstructor; import org.gridsuite.modification.NetworkModificationException; -import org.gridsuite.modification.NetworkModificationException.Type; import org.gridsuite.modification.dto.*; import org.gridsuite.modification.report.NetworkModificationReportResourceBundle; import org.gridsuite.modification.utils.ModificationUtils; @@ -44,9 +43,9 @@ public class VoltageInitModification extends AbstractModification { private static final String COUNT = "count"; @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { if (voltageInitModificationInfos == null) { - throw new NetworkModificationException(Type.VOLTAGE_INIT_MODIFICATION_ERROR, "No voltage init modification to apply !!"); + throw new NetworkModificationException("No voltage init modification to apply !!"); } } diff --git a/src/main/java/org/gridsuite/modification/modifications/VoltageLevelCreation.java b/src/main/java/org/gridsuite/modification/modifications/VoltageLevelCreation.java index a0e18b84..e8c96866 100644 --- a/src/main/java/org/gridsuite/modification/modifications/VoltageLevelCreation.java +++ b/src/main/java/org/gridsuite/modification/modifications/VoltageLevelCreation.java @@ -8,11 +8,9 @@ import com.powsybl.commons.report.ReportNode; import com.powsybl.iidm.network.Network; -import org.gridsuite.modification.NetworkModificationException; import org.gridsuite.modification.dto.VoltageLevelCreationInfos; import org.gridsuite.modification.utils.ModificationUtils; -import static org.gridsuite.modification.NetworkModificationException.Type.CREATE_VOLTAGE_LEVEL_ERROR; import static org.gridsuite.modification.utils.ModificationUtils.checkIsNotNegativeValue; /** @@ -27,12 +25,12 @@ public VoltageLevelCreation(VoltageLevelCreationInfos modificationInfos) { } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { String errorMessage = "Voltage level '" + modificationInfos.getEquipmentId() + "' : "; ModificationUtils.getInstance().controlVoltageLevelCreation(modificationInfos, network); - checkIsNotNegativeValue(errorMessage, modificationInfos.getNominalV(), CREATE_VOLTAGE_LEVEL_ERROR, "Nominal Voltage"); - checkIsNotNegativeValue(errorMessage, modificationInfos.getLowVoltageLimit(), CREATE_VOLTAGE_LEVEL_ERROR, "Low voltage limit"); - checkIsNotNegativeValue(errorMessage, modificationInfos.getHighVoltageLimit(), CREATE_VOLTAGE_LEVEL_ERROR, "High voltage limit"); + checkIsNotNegativeValue(errorMessage, modificationInfos.getNominalV(), "Nominal Voltage"); + checkIsNotNegativeValue(errorMessage, modificationInfos.getLowVoltageLimit(), "Low voltage limit"); + checkIsNotNegativeValue(errorMessage, modificationInfos.getHighVoltageLimit(), "High voltage limit"); } @Override diff --git a/src/main/java/org/gridsuite/modification/modifications/VoltageLevelModification.java b/src/main/java/org/gridsuite/modification/modifications/VoltageLevelModification.java index d9c38dbc..b22e8b24 100644 --- a/src/main/java/org/gridsuite/modification/modifications/VoltageLevelModification.java +++ b/src/main/java/org/gridsuite/modification/modifications/VoltageLevelModification.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.Objects; -import static org.gridsuite.modification.NetworkModificationException.Type.MODIFY_VOLTAGE_LEVEL_ERROR; import static org.gridsuite.modification.utils.ModificationUtils.checkIsNotNegativeValue; import static org.gridsuite.modification.utils.ModificationUtils.insertReportNode; @@ -39,38 +38,38 @@ public VoltageLevelModification(VoltageLevelModificationInfos voltageLevelModifi } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { boolean ipMinSet = false; boolean ipMaxSet = false; String errorMessage = "Voltage level '" + modificationInfos.getEquipmentId() + "' : "; if (Objects.nonNull(modificationInfos.getIpMin())) { ipMinSet = true; if (modificationInfos.getIpMin().getValue() < 0) { - throw new NetworkModificationException(MODIFY_VOLTAGE_LEVEL_ERROR, "IpMin must be positive"); + throw new NetworkModificationException("IpMin must be positive"); } } if (Objects.nonNull(modificationInfos.getIpMax())) { ipMaxSet = true; if (modificationInfos.getIpMax().getValue() < 0) { - throw new NetworkModificationException(MODIFY_VOLTAGE_LEVEL_ERROR, "IpMax must be positive"); + throw new NetworkModificationException("IpMax must be positive"); } } if (ipMinSet && ipMaxSet) { if (modificationInfos.getIpMin().getValue() > modificationInfos.getIpMax().getValue()) { - throw new NetworkModificationException(MODIFY_VOLTAGE_LEVEL_ERROR, "IpMin cannot be greater than IpMax"); + throw new NetworkModificationException("IpMin cannot be greater than IpMax"); } } else if (ipMinSet || ipMaxSet) { // only one Icc set: check with existing VL attributes checkIccValuesAgainstEquipmentInNetwork(network, ipMinSet, ipMaxSet); } if (modificationInfos.getNominalV() != null) { - checkIsNotNegativeValue(errorMessage, modificationInfos.getNominalV().getValue(), MODIFY_VOLTAGE_LEVEL_ERROR, "Nominal Voltage"); + checkIsNotNegativeValue(errorMessage, modificationInfos.getNominalV().getValue(), "Nominal Voltage"); } if (modificationInfos.getLowVoltageLimit() != null) { - checkIsNotNegativeValue(errorMessage, modificationInfos.getLowVoltageLimit().getValue(), MODIFY_VOLTAGE_LEVEL_ERROR, "Low voltage limit"); + checkIsNotNegativeValue(errorMessage, modificationInfos.getLowVoltageLimit().getValue(), "Low voltage limit"); } if (modificationInfos.getHighVoltageLimit() != null) { - checkIsNotNegativeValue(errorMessage, modificationInfos.getHighVoltageLimit().getValue(), MODIFY_VOLTAGE_LEVEL_ERROR, "High voltage limit"); + checkIsNotNegativeValue(errorMessage, modificationInfos.getHighVoltageLimit().getValue(), "High voltage limit"); } } @@ -79,12 +78,12 @@ private void checkIccValuesAgainstEquipmentInNetwork(Network network, boolean ip IdentifiableShortCircuit identifiableShortCircuit = existingVoltageLevel.getExtension(IdentifiableShortCircuit.class); if (Objects.isNull(identifiableShortCircuit)) { if (ipMinSet) { - throw new NetworkModificationException(MODIFY_VOLTAGE_LEVEL_ERROR, "IpMax is required"); + throw new NetworkModificationException("IpMax is required"); } } else { if (ipMinSet && modificationInfos.getIpMin().getValue() > identifiableShortCircuit.getIpMax() || ipMaxSet && identifiableShortCircuit.getIpMin() > modificationInfos.getIpMax().getValue()) { - throw new NetworkModificationException(MODIFY_VOLTAGE_LEVEL_ERROR, "IpMin cannot be greater than IpMax"); + throw new NetworkModificationException("IpMin cannot be greater than IpMax"); } } } diff --git a/src/main/java/org/gridsuite/modification/modifications/VoltageLevelTopologyModification.java b/src/main/java/org/gridsuite/modification/modifications/VoltageLevelTopologyModification.java index 8553fc1a..9c5b0a43 100644 --- a/src/main/java/org/gridsuite/modification/modifications/VoltageLevelTopologyModification.java +++ b/src/main/java/org/gridsuite/modification/modifications/VoltageLevelTopologyModification.java @@ -16,9 +16,6 @@ import org.gridsuite.modification.dto.EquipmentAttributeModificationInfos; import org.gridsuite.modification.dto.VoltageLevelTopologyModificationInfos; -import static org.gridsuite.modification.NetworkModificationException.Type.MODIFY_VOLTAGE_LEVEL_TOPOLOGY_ERROR; -import static org.gridsuite.modification.NetworkModificationException.Type.VOLTAGE_LEVEL_NOT_FOUND; - /** * @author REHILI Ghazwa */ @@ -31,10 +28,10 @@ public VoltageLevelTopologyModification(VoltageLevelTopologyModificationInfos vo } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { VoltageLevel voltageLevel = network.getVoltageLevel(modificationInfos.getEquipmentId()); if (voltageLevel == null) { - throw new NetworkModificationException(VOLTAGE_LEVEL_NOT_FOUND, modificationInfos.getEquipmentId()); + throw new NetworkModificationException("Voltage level not found: " + modificationInfos.getEquipmentId()); } if (!modificationInfos.getEquipmentAttributeModificationList().isEmpty()) { for (EquipmentAttributeModificationInfos equipmentAttributeModificationInfos : modificationInfos.getEquipmentAttributeModificationList()) { @@ -42,7 +39,7 @@ public void check(Network network) throws NetworkModificationException { equipmentAttributeModification.check(network); } } else { - throw new NetworkModificationException(MODIFY_VOLTAGE_LEVEL_TOPOLOGY_ERROR, "Missing required switches to modify the voltage level topology"); + throw new NetworkModificationException("Missing required switches to modify the voltage level topology"); } } diff --git a/src/main/java/org/gridsuite/modification/modifications/VscCreation.java b/src/main/java/org/gridsuite/modification/modifications/VscCreation.java index 5a5c19b6..4787461a 100644 --- a/src/main/java/org/gridsuite/modification/modifications/VscCreation.java +++ b/src/main/java/org/gridsuite/modification/modifications/VscCreation.java @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.List; -import static org.gridsuite.modification.NetworkModificationException.Type.*; import static org.gridsuite.modification.utils.ModificationUtils.*; /** @@ -40,20 +39,20 @@ public VscCreation(VscCreationInfos modificationInfos) { } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { if (network.getHvdcLine(modificationInfos.getEquipmentId()) != null) { - throw new NetworkModificationException(HVDC_LINE_ALREADY_EXISTS, modificationInfos.getEquipmentId()); + throw new NetworkModificationException("HVDC line already exists: " + modificationInfos.getEquipmentId()); } String errorMessage = "HVDC vsc '" + modificationInfos.getEquipmentId() + "' : "; checkConverterStation(network, modificationInfos.getConverterStation1()); checkConverterStation(network, modificationInfos.getConverterStation2()); checkDroop(); - checkIsNotNegativeValue(errorMessage, modificationInfos.getR(), CREATE_VSC_ERROR, "Resistance R"); - checkIsNotNegativeValue(errorMessage, modificationInfos.getNominalV(), CREATE_VSC_ERROR, "Nominal voltage"); - checkIsNotNegativeValue(errorMessage, modificationInfos.getConverterStation1().getVoltageSetpoint(), CREATE_VSC_ERROR, "voltage set point side 1"); - checkIsNotNegativeValue(errorMessage, modificationInfos.getConverterStation2().getVoltageSetpoint(), CREATE_VSC_ERROR, "voltage set point side 2"); - checkIsPercentage(errorMessage, modificationInfos.getConverterStation1().getLossFactor(), CREATE_VSC_ERROR, "loss factor side 1"); - checkIsPercentage(errorMessage, modificationInfos.getConverterStation2().getLossFactor(), CREATE_VSC_ERROR, "loss factor side 2"); + checkIsNotNegativeValue(errorMessage, modificationInfos.getR(), "Resistance R"); + checkIsNotNegativeValue(errorMessage, modificationInfos.getNominalV(), "Nominal voltage"); + checkIsNotNegativeValue(errorMessage, modificationInfos.getConverterStation1().getVoltageSetpoint(), "voltage set point side 1"); + checkIsNotNegativeValue(errorMessage, modificationInfos.getConverterStation2().getVoltageSetpoint(), "voltage set point side 2"); + checkIsPercentage(errorMessage, modificationInfos.getConverterStation1().getLossFactor(), "loss factor side 1"); + checkIsPercentage(errorMessage, modificationInfos.getConverterStation2().getLossFactor(), "loss factor side 2"); } private void checkDroop() { @@ -70,7 +69,7 @@ private void checkDroop() { } // at least one field is provided but not for the others => NOT OK if (isPresentAngleDroopActivePowerControl || isPresentDroop || isPresentP0) { - throw new NetworkModificationException(WRONG_HVDC_ANGLE_DROOP_ACTIVE_POWER_CONTROL, VscModification.ACTIVE_POWER_CONTROL_DROOP_P0_REQUIRED_ERROR_MSG); + throw new NetworkModificationException(VscModification.ACTIVE_POWER_CONTROL_DROOP_P0_REQUIRED_ERROR_MSG); } // otherwise, i.e. none of the fields is not provided => OK extension will not be created } @@ -78,7 +77,7 @@ private void checkDroop() { private void checkConverterStation(Network network, ConverterStationCreationInfos converterStation) { if (converterStation == null) { - throw new NetworkModificationException(CREATE_VSC_ERROR, modificationInfos.getEquipmentId() + "Missing required converter station"); + throw new NetworkModificationException(modificationInfos.getEquipmentId() + "Missing required converter station"); } // check connectivity ModificationUtils.getInstance().controlConnectivity(network, @@ -88,7 +87,6 @@ private void checkConverterStation(Network network, // check reactive limits ModificationUtils.getInstance().checkReactiveLimitsCreation(converterStation, - CREATE_VSC_ERROR, modificationInfos.getEquipmentId(), "Vsc"); } diff --git a/src/main/java/org/gridsuite/modification/modifications/VscModification.java b/src/main/java/org/gridsuite/modification/modifications/VscModification.java index d13e2ffd..2eb6bd30 100644 --- a/src/main/java/org/gridsuite/modification/modifications/VscModification.java +++ b/src/main/java/org/gridsuite/modification/modifications/VscModification.java @@ -26,8 +26,6 @@ import java.util.List; import java.util.Optional; -import static org.gridsuite.modification.NetworkModificationException.Type.MODIFY_VSC_ERROR; -import static org.gridsuite.modification.NetworkModificationException.Type.WRONG_HVDC_ANGLE_DROOP_ACTIVE_POWER_CONTROL; import static org.gridsuite.modification.modifications.VscCreation.VSC_CHARACTERISTICS; import static org.gridsuite.modification.modifications.VscCreation.VSC_SETPOINTS; import static org.gridsuite.modification.utils.ModificationUtils.checkIsNotNegativeValue; @@ -57,15 +55,15 @@ public static boolean shouldCreateDroopActivePowerControlExtension(boolean isPre protected void checkConverterStation(@Nonnull ConverterStationModificationInfos converterStationModificationInfos, @Nonnull VscConverterStation vscConverterStation) { String errorMessage = "Converter station '" + converterStationModificationInfos.getEquipmentId() + "' : "; ModificationUtils.getInstance().checkReactiveLimit(vscConverterStation, converterStationModificationInfos.getMinQ(), converterStationModificationInfos.getMaxQ(), - converterStationModificationInfos.getReactiveCapabilityCurvePoints(), MODIFY_VSC_ERROR, errorMessage); + converterStationModificationInfos.getReactiveCapabilityCurvePoints(), errorMessage); } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { if (modificationInfos == null || modificationInfos.getConverterStation1() == null || modificationInfos.getConverterStation2() == null) { - throw new NetworkModificationException(MODIFY_VSC_ERROR, "Missing required attributes to modify the equipment"); + throw new NetworkModificationException("Missing required attributes to modify the equipment"); } HvdcLine hvdcLine = ModificationUtils.getInstance().getHvdcLine(network, modificationInfos.getEquipmentId()); String errorMessage = "HVDC vsc '" + modificationInfos.getEquipmentId() + "' : "; @@ -76,26 +74,26 @@ public void check(Network network) throws NetworkModificationException { checkConverterStation(modificationInfos.getConverterStation2(), converterStation2); checkDroop(hvdcLine); if (modificationInfos.getR() != null) { - checkIsNotNegativeValue(errorMessage, modificationInfos.getR().getValue(), MODIFY_VSC_ERROR, "Resistance R"); + checkIsNotNegativeValue(errorMessage, modificationInfos.getR().getValue(), "Resistance R"); } if (modificationInfos.getNominalV() != null) { - checkIsNotNegativeValue(errorMessage, modificationInfos.getNominalV().getValue(), MODIFY_VSC_ERROR, "Nominal voltage"); + checkIsNotNegativeValue(errorMessage, modificationInfos.getNominalV().getValue(), "Nominal voltage"); } if (modificationInfos.getConverterStation1().getVoltageSetpoint() != null) { checkIsNotNegativeValue(errorMessage, modificationInfos.getConverterStation1().getVoltageSetpoint().getValue(), - MODIFY_VSC_ERROR, "voltage set point side 1"); + "voltage set point side 1"); } if (modificationInfos.getConverterStation2().getVoltageSetpoint() != null) { checkIsNotNegativeValue(errorMessage, modificationInfos.getConverterStation2().getVoltageSetpoint().getValue(), - MODIFY_VSC_ERROR, "voltage set point side 2"); + "voltage set point side 2"); } if (modificationInfos.getConverterStation1().getLossFactor() != null) { checkIsPercentage(errorMessage, modificationInfos.getConverterStation1().getLossFactor().getValue(), - MODIFY_VSC_ERROR, "loss factor side 1"); + "loss factor side 1"); } if (modificationInfos.getConverterStation2().getLossFactor() != null) { checkIsPercentage(errorMessage, modificationInfos.getConverterStation2().getLossFactor().getValue(), - MODIFY_VSC_ERROR, "loss factor side 2"); + "loss factor side 2"); } } @@ -116,7 +114,7 @@ private void checkDroop(HvdcLine hvdcLine) { } // at least one field is provided but not for the others => NOT OK if (isPresentAngleDroopActivePowerControl || isPresentDroop || isPresentP0) { - throw new NetworkModificationException(WRONG_HVDC_ANGLE_DROOP_ACTIVE_POWER_CONTROL, ACTIVE_POWER_CONTROL_DROOP_P0_REQUIRED_ERROR_MSG); + throw new NetworkModificationException(ACTIVE_POWER_CONTROL_DROOP_P0_REQUIRED_ERROR_MSG); } // otherwise, i.e. none of the fields is provided => OK extension will not be created } diff --git a/src/main/java/org/gridsuite/modification/modifications/byfilter/AbstractModificationByAssignment.java b/src/main/java/org/gridsuite/modification/modifications/byfilter/AbstractModificationByAssignment.java index f7732a15..b5a91323 100644 --- a/src/main/java/org/gridsuite/modification/modifications/byfilter/AbstractModificationByAssignment.java +++ b/src/main/java/org/gridsuite/modification/modifications/byfilter/AbstractModificationByAssignment.java @@ -93,8 +93,6 @@ private String getEditedFieldLabel(AbstractAssignmentInfos modificationByFilterI public abstract IdentifiableType getEquipmentType(); - public abstract NetworkModificationException.Type getExceptionType(); - public abstract List getAssignmentInfosList(); protected abstract boolean preCheckValue(Identifiable equipment, @@ -122,17 +120,17 @@ public void initApplicationContext(IFilterService filterService, ILoadFlowServic } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { if (getModificationInfos() == null) { - throw new NetworkModificationException(getExceptionType(), "Missing required attributes to modify the equipment"); + throw new NetworkModificationException("Missing required attributes to modify the equipment"); } if (CollectionUtils.isEmpty(getAssignmentInfosList())) { - throw new NetworkModificationException(getExceptionType(), String.format("At least one %s is required", getModificationTypeLabel())); + throw new NetworkModificationException(String.format("At least one %s is required", getModificationTypeLabel())); } if (getAssignmentInfosList().stream().anyMatch(modificationByFilterInfos -> CollectionUtils.isEmpty(modificationByFilterInfos.getFilters()))) { - throw new NetworkModificationException(getExceptionType(), String.format("Every %s must have at least one filter", getModificationTypeLabel())); + throw new NetworkModificationException(String.format("Every %s must have at least one filter", getModificationTypeLabel())); } } @@ -141,7 +139,7 @@ public void apply(Network network, ReportNode subReportNode) { // collect all filters from all variations Map filters = getFilters(); - Map filterUuidEquipmentsMap = ModificationUtils.getUuidFilterEquipmentsMap(filterService, network, subReportNode, filters, getModificationInfos().getErrorType()); + Map filterUuidEquipmentsMap = ModificationUtils.getUuidFilterEquipmentsMap(filterService, network, subReportNode, filters); if (filterUuidEquipmentsMap != null) { ReportNode subReporter = subReportNode.newReportNode() diff --git a/src/main/java/org/gridsuite/modification/modifications/byfilter/ByFormulaModification.java b/src/main/java/org/gridsuite/modification/modifications/byfilter/ByFormulaModification.java index e0f69fd0..af81cda9 100644 --- a/src/main/java/org/gridsuite/modification/modifications/byfilter/ByFormulaModification.java +++ b/src/main/java/org/gridsuite/modification/modifications/byfilter/ByFormulaModification.java @@ -11,7 +11,6 @@ import com.powsybl.commons.report.TypedValue; import com.powsybl.iidm.network.Identifiable; import com.powsybl.iidm.network.IdentifiableType; -import org.gridsuite.modification.NetworkModificationException; import org.gridsuite.modification.dto.ByFormulaModificationInfos; import org.gridsuite.modification.dto.ModificationInfos; import org.gridsuite.modification.dto.byfilter.AbstractAssignmentInfos; @@ -25,8 +24,6 @@ import java.util.Collections; import java.util.List; -import static org.gridsuite.modification.NetworkModificationException.Type.BY_FORMULA_MODIFICATION_ERROR; - /** * @author Thang PHAM */ @@ -58,11 +55,6 @@ public List getAssignmentInfosList() { return Collections.unmodifiableList(modificationInfos.getFormulaInfosList()); } - @Override - public NetworkModificationException.Type getExceptionType() { - return BY_FORMULA_MODIFICATION_ERROR; - } - @Override protected boolean preCheckValue(Identifiable equipment, AbstractAssignmentInfos abstractAssignmentInfos, List reports, List notEditableEquipments) { FormulaInfos formulaInfos = (FormulaInfos) abstractAssignmentInfos; diff --git a/src/main/java/org/gridsuite/modification/modifications/byfilter/ModificationByAssignment.java b/src/main/java/org/gridsuite/modification/modifications/byfilter/ModificationByAssignment.java index 97b5cdd4..d9ec1e44 100644 --- a/src/main/java/org/gridsuite/modification/modifications/byfilter/ModificationByAssignment.java +++ b/src/main/java/org/gridsuite/modification/modifications/byfilter/ModificationByAssignment.java @@ -10,7 +10,6 @@ import com.powsybl.commons.report.ReportNode; import com.powsybl.iidm.network.Identifiable; import com.powsybl.iidm.network.IdentifiableType; -import org.gridsuite.modification.NetworkModificationException; import org.gridsuite.modification.dto.ModificationByAssignmentInfos; import org.gridsuite.modification.dto.ModificationInfos; import org.gridsuite.modification.dto.byfilter.AbstractAssignmentInfos; @@ -22,7 +21,6 @@ import java.util.Collections; import java.util.List; -import static org.gridsuite.modification.NetworkModificationException.Type.MODIFICATION_BY_ASSIGNMENT_ERROR; import static org.gridsuite.modification.dto.byfilter.equipmentfield.PropertyField.getReferenceValue; import static org.gridsuite.modification.dto.byfilter.equipmentfield.PropertyField.setNewValue; @@ -58,11 +56,6 @@ public List getAssignmentInfosList() { return Collections.unmodifiableList(modificationInfos.getAssignmentInfosList()); } - @Override - public NetworkModificationException.Type getExceptionType() { - return MODIFICATION_BY_ASSIGNMENT_ERROR; - } - @Override protected boolean isEquipmentEditable(Identifiable equipment, AbstractAssignmentInfos abstractAssignmentInfos, List equipmentsReport) { AssignmentInfos assignmentInfos = (AssignmentInfos) abstractAssignmentInfos; diff --git a/src/main/java/org/gridsuite/modification/modifications/tabular/TabularCreation.java b/src/main/java/org/gridsuite/modification/modifications/tabular/TabularCreation.java index 735fecf1..e1d23ba8 100644 --- a/src/main/java/org/gridsuite/modification/modifications/tabular/TabularCreation.java +++ b/src/main/java/org/gridsuite/modification/modifications/tabular/TabularCreation.java @@ -14,8 +14,6 @@ import org.gridsuite.modification.dto.ShuntCompensatorCreationInfos; import org.gridsuite.modification.dto.tabular.TabularCreationInfos; -import static org.gridsuite.modification.NetworkModificationException.Type.TABULAR_CREATION_ERROR; - /** * @author Franck Lecuyer */ @@ -26,9 +24,9 @@ public TabularCreation(TabularCreationInfos modificationInfos) { } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { if (modificationInfos == null) { - throw new NetworkModificationException(TABULAR_CREATION_ERROR, "No tabular creation to apply !!"); + throw new NetworkModificationException("No tabular creation to apply !!"); } } diff --git a/src/main/java/org/gridsuite/modification/modifications/tabular/TabularModification.java b/src/main/java/org/gridsuite/modification/modifications/tabular/TabularModification.java index bd4ee9be..0cfd615d 100644 --- a/src/main/java/org/gridsuite/modification/modifications/tabular/TabularModification.java +++ b/src/main/java/org/gridsuite/modification/modifications/tabular/TabularModification.java @@ -15,8 +15,6 @@ import org.gridsuite.modification.dto.ShuntCompensatorModificationInfos; import org.gridsuite.modification.dto.tabular.TabularModificationInfos; -import static org.gridsuite.modification.NetworkModificationException.Type.TABULAR_MODIFICATION_ERROR; - /** * @author Etienne Homer */ @@ -27,9 +25,9 @@ public TabularModification(TabularModificationInfos modificationInfos) { } @Override - public void check(Network network) throws NetworkModificationException { + public void check(Network network) { if (modificationInfos == null) { - throw new NetworkModificationException(TABULAR_MODIFICATION_ERROR, "No tabular modification to apply !!"); + throw new NetworkModificationException("No tabular modification to apply !!"); } } diff --git a/src/main/java/org/gridsuite/modification/utils/ModificationUtils.java b/src/main/java/org/gridsuite/modification/utils/ModificationUtils.java index 86393336..68f37a2a 100644 --- a/src/main/java/org/gridsuite/modification/utils/ModificationUtils.java +++ b/src/main/java/org/gridsuite/modification/utils/ModificationUtils.java @@ -34,7 +34,6 @@ import java.util.stream.Stream; import static com.powsybl.iidm.network.TwoSides.ONE; -import static org.gridsuite.modification.NetworkModificationException.Type.*; import static org.gridsuite.modification.dto.OperationalLimitsGroupInfos.Applicability.SIDE1; import static org.gridsuite.modification.dto.OperationalLimitsGroupInfos.Applicability.SIDE2; import static org.gridsuite.modification.modifications.AbstractBranchModification.*; @@ -105,7 +104,7 @@ public static Double nanIfNull(Double d) { public VoltageLevel getVoltageLevel(Network network, String voltageLevelId) { VoltageLevel voltageLevel = network.getVoltageLevel(voltageLevelId); if (voltageLevel == null) { - throw new NetworkModificationException(VOLTAGE_LEVEL_NOT_FOUND, voltageLevelId); + throw new NetworkModificationException("Voltage level " + voltageLevelId + NOT_EXIST_IN_NETWORK); } return voltageLevel; } @@ -113,7 +112,7 @@ public VoltageLevel getVoltageLevel(Network network, String voltageLevelId) { public Line getLine(Network network, String lineId) { Line line = network.getLine(lineId); if (line == null) { - throw new NetworkModificationException(LINE_NOT_FOUND, lineId); + throw new NetworkModificationException("Line " + lineId + NOT_EXIST_IN_NETWORK); } return line; } @@ -121,7 +120,7 @@ public Line getLine(Network network, String lineId) { public Battery getBattery(Network network, String batteryId) { Battery battery = network.getBattery(batteryId); if (battery == null) { - throw new NetworkModificationException(BATTERY_NOT_FOUND, "Battery " + batteryId + NOT_EXIST_IN_NETWORK); + throw new NetworkModificationException("Battery " + batteryId + NOT_EXIST_IN_NETWORK); } return battery; } @@ -129,7 +128,7 @@ public Battery getBattery(Network network, String batteryId) { public Generator getGenerator(Network network, String generatorId) { Generator generator = network.getGenerator(generatorId); if (generator == null) { - throw new NetworkModificationException(GENERATOR_NOT_FOUND, "Generator " + generatorId + NOT_EXIST_IN_NETWORK); + throw new NetworkModificationException("Generator " + generatorId + NOT_EXIST_IN_NETWORK); } return generator; } @@ -137,7 +136,7 @@ public Generator getGenerator(Network network, String generatorId) { public VscConverterStation getVscConverterStation(Network network, String converterStationId) { VscConverterStation vscConverterStation = network.getVscConverterStation(converterStationId); if (vscConverterStation == null) { - throw new NetworkModificationException(VSC_CONVERTER_STATION_NOT_FOUND, "Vsc converter station " + converterStationId + NOT_EXIST_IN_NETWORK); + throw new NetworkModificationException("Vsc converter station " + converterStationId + NOT_EXIST_IN_NETWORK); } return vscConverterStation; } @@ -145,7 +144,7 @@ public VscConverterStation getVscConverterStation(Network network, String conver public LccConverterStation getLccConverterStation(Network network, String converterStationId) { LccConverterStation lccConverterStation = network.getLccConverterStation(converterStationId); if (lccConverterStation == null) { - throw new NetworkModificationException(LCC_CONVERTER_STATION_NOT_FOUND, "Lcc converter station " + converterStationId + NOT_EXIST_IN_NETWORK); + throw new NetworkModificationException("Lcc converter station " + converterStationId + NOT_EXIST_IN_NETWORK); } return lccConverterStation; } @@ -154,7 +153,7 @@ public LccConverterStation getLccConverterStation(Network network, String conver public HvdcLine getHvdcLine(Network network, String hvdcLineId) { HvdcLine hvdcLine = network.getHvdcLine(hvdcLineId); if (hvdcLine == null) { - throw new NetworkModificationException(HVDC_LINE_NOT_FOUND, "Hvdc line " + hvdcLineId + NOT_EXIST_IN_NETWORK); + throw new NetworkModificationException("Hvdc line " + hvdcLineId + NOT_EXIST_IN_NETWORK); } return hvdcLine; } @@ -162,7 +161,7 @@ public HvdcLine getHvdcLine(Network network, String hvdcLineId) { public StaticVarCompensator getStaticVarCompensator(Network network, String staticVarCompensatorId) { StaticVarCompensator staticVarCompensator = network.getStaticVarCompensator(staticVarCompensatorId); if (staticVarCompensator == null) { - throw new NetworkModificationException(STATIC_VAR_COMPENSATOR_NOT_FOUND, "Static var compensator " + staticVarCompensatorId + DOES_NOT_EXIST_IN_NETWORK); + throw new NetworkModificationException("Static var compensator " + staticVarCompensatorId + DOES_NOT_EXIST_IN_NETWORK); } return staticVarCompensator; } @@ -207,7 +206,7 @@ public int getPosition(String busOrBusbarSectionId, Network network, VoltageLeve var position = 0; var bbs = network.getBusbarSection(busOrBusbarSectionId); if (bbs == null) { - throw new NetworkModificationException(BUSBAR_SECTION_NOT_FOUND, busOrBusbarSectionId); + throw new NetworkModificationException("Busbar section " + busOrBusbarSectionId + NOT_EXIST_IN_NETWORK); } var extensionExist = bbs.getExtension(BusbarSectionPosition.class) != null; @@ -234,7 +233,7 @@ public Bus getBusBreakerBus(VoltageLevel voltageLevel, String busId) { VoltageLevel.BusBreakerView busBreakerView = voltageLevel.getBusBreakerView(); Bus bus = busBreakerView.getBus(busId); if (bus == null) { - throw new NetworkModificationException(BUS_NOT_FOUND, busId); + throw new NetworkModificationException("Bus " + busId + NOT_EXIST_IN_NETWORK); } return bus; } @@ -243,7 +242,7 @@ public BusbarSection getNodeBreakerBusbarSection(VoltageLevel voltageLevel, Stri VoltageLevel.NodeBreakerView nodeBreakerView = voltageLevel.getNodeBreakerView(); BusbarSection busbarSection = nodeBreakerView.getBusbarSection(busBarSectionId); if (busbarSection == null) { - throw new NetworkModificationException(BUSBAR_SECTION_NOT_FOUND, busBarSectionId); + throw new NetworkModificationException("Busbar section " + busBarSectionId + NOT_EXIST_IN_NETWORK); } return busbarSection; } @@ -253,7 +252,7 @@ public int createNodeBreakerCellSwitches(VoltageLevel voltageLevel, String busBa VoltageLevel.NodeBreakerView nodeBreakerView = voltageLevel.getNodeBreakerView(); BusbarSection busbarSection = nodeBreakerView.getBusbarSection(busBarSectionId); if (busbarSection == null) { - throw new NetworkModificationException(BUSBAR_SECTION_NOT_FOUND, busBarSectionId); + throw new NetworkModificationException("Busbar section " + busBarSectionId + NOT_EXIST_IN_NETWORK); } // creating the disconnector @@ -296,7 +295,7 @@ public void controlNewOrExistingVoltageLevel(VoltageLevelCreationInfos mayNewVL, // use existing VL VoltageLevel vl = network.getVoltageLevel(existingVoltageLevelId); if (vl == null) { - throw new NetworkModificationException(VOLTAGE_LEVEL_NOT_FOUND, existingVoltageLevelId); + throw new NetworkModificationException("Voltage level " + existingVoltageLevelId + NOT_EXIST_IN_NETWORK); } // check existing busbar/bus controlBus(vl, bbsOrBusId); @@ -305,25 +304,24 @@ public void controlNewOrExistingVoltageLevel(VoltageLevelCreationInfos mayNewVL, public void controlVoltageLevelCreation(VoltageLevelCreationInfos voltageLevelCreationInfos, Network network) { if (network.getVoltageLevel(voltageLevelCreationInfos.getEquipmentId()) != null) { - throw new NetworkModificationException(VOLTAGE_LEVEL_ALREADY_EXISTS, voltageLevelCreationInfos.getEquipmentId()); + throw new NetworkModificationException("Voltage level " + voltageLevelCreationInfos.getEquipmentId() + " already exists"); } if (voltageLevelCreationInfos.getCouplingDevices().stream() - .anyMatch(cd -> cd.getBusbarSectionId1().equals(cd.getBusbarSectionId2()))) { - throw new NetworkModificationException(CREATE_VOLTAGE_LEVEL_ERROR, - "Coupling between same bus bar section is not allowed"); + .anyMatch(cd -> cd.getBusbarSectionId1().equals(cd.getBusbarSectionId2()))) { + throw new NetworkModificationException("Coupling between same bus bar section is not allowed"); } if (Objects.nonNull(voltageLevelCreationInfos.getIpMin()) && voltageLevelCreationInfos.getIpMin() < 0) { - throw new NetworkModificationException(CREATE_VOLTAGE_LEVEL_ERROR, "IpMin must be positive"); + throw new NetworkModificationException("IpMin must be positive"); } if (Objects.nonNull(voltageLevelCreationInfos.getIpMax()) && voltageLevelCreationInfos.getIpMax() < 0) { - throw new NetworkModificationException(CREATE_VOLTAGE_LEVEL_ERROR, "IpMax must be positive"); + throw new NetworkModificationException("IpMax must be positive"); } if (Objects.nonNull(voltageLevelCreationInfos.getIpMin()) && Objects.isNull(voltageLevelCreationInfos.getIpMax())) { - throw new NetworkModificationException(CREATE_VOLTAGE_LEVEL_ERROR, "IpMax is required"); + throw new NetworkModificationException("IpMax is required"); } if (Objects.nonNull(voltageLevelCreationInfos.getIpMin()) && Objects.nonNull(voltageLevelCreationInfos.getIpMax()) - && voltageLevelCreationInfos.getIpMin() > voltageLevelCreationInfos.getIpMax()) { - throw new NetworkModificationException(CREATE_VOLTAGE_LEVEL_ERROR, "IpMin cannot be greater than IpMax"); + && voltageLevelCreationInfos.getIpMin() > voltageLevelCreationInfos.getIpMax()) { + throw new NetworkModificationException("IpMin cannot be greater than IpMax"); } } @@ -388,7 +386,7 @@ public void createVoltageLevel(VoltageLevelCreationInfos voltageLevelCreationInf substation = network.getSubstation(substationId); } if (substation == null) { - throw new NetworkModificationException(SUBSTATION_NOT_FOUND, substationId); + throw new NetworkModificationException("Substation " + substationId + NOT_EXIST_IN_NETWORK); } VoltageLevel voltageLevel = substation.newVoltageLevel() .setId(voltageLevelCreationInfos.getEquipmentId()) @@ -634,12 +632,12 @@ public Terminal getTerminalFromIdentifiable(Network network, String equipmentId, Identifiable identifiable = getEquipmentByIdentifiableType(network, IdentifiableType.valueOf(type), equipmentId); if (identifiable == null) { - throw new NetworkModificationException(EQUIPMENT_NOT_FOUND, "Equipment with id=" + equipmentId + " not found with type " + type); + throw new NetworkModificationException("Equipment with id=" + equipmentId + " not found with type " + type); } // checking if voltage level exists VoltageLevel voltageLevel = network.getVoltageLevel(voltageLevelId); if (voltageLevel == null) { - throw new NetworkModificationException(VOLTAGE_LEVEL_NOT_FOUND, "Voltage level with id=" + voltageLevelId + " not found"); + throw new NetworkModificationException("Voltage level with id=" + voltageLevelId + " not found"); } if (identifiable instanceof Injection) { @@ -670,7 +668,7 @@ public List getTerminalsFromIdentifiable(Identifiable identifiable) hvdcLine.getConverterStation2().getTerminal() ).toList(); } - throw NetworkModificationException.createEquipmentTypeNotSupported(identifiable.getClass().getSimpleName()); + throw new NetworkModificationException("The equipment type : " + identifiable.getClass().getSimpleName() + " is not supported"); } public static boolean isInjectionConnected(Injection injection) { @@ -732,11 +730,10 @@ public ReportNode modifyBranchConnectivityAttributes(ConnectablePosition conn List actions = new ArrayList<>(); // Action = connect|disconnect actions.add(branch.getTerminal1().isConnected() ? DISCONNECT : CONNECT); actions.add(branch.getTerminal2().isConnected() ? DISCONNECT : CONNECT); - throw new NetworkModificationException(exceptions.getFirst().getType(), - String.format("Could not %s equipment '%s' on side %s", - actions.stream().distinct().collect(Collectors.joining("/")), - branch.getId(), - "1 & 2")); // Exactly the both sides awaited here + throw new NetworkModificationException(String.format("Could not %s equipment '%s' on side %s", + actions.stream().distinct().collect(Collectors.joining("/")), + branch.getId(), + "1 & 2")); // Exactly the both sides awaited here } return reportModifications(connectivityReports, reports, "network.modification.ConnectivityModified"); @@ -1012,10 +1009,9 @@ private void modifyConnection(AttributeModification terminalConnected, private void validateConnectionChange(boolean success, Identifiable equipment, String action, List reports, ThreeSides side) { if (!success) { - throw new NetworkModificationException( - equipment instanceof Branch ? BRANCH_MODIFICATION_ERROR : INJECTION_MODIFICATION_ERROR, - side == null ? String.format(COULD_NOT_ACTION_EQUIPMENT, action, equipment.getId()) - : String.format(COULD_NOT_ACTION_EQUIPMENT_ON_SIDE, action, equipment.getId(), side.getNum())); + throw new NetworkModificationException(side == null + ? String.format(COULD_NOT_ACTION_EQUIPMENT, action, equipment.getId()) + : String.format(COULD_NOT_ACTION_EQUIPMENT_ON_SIDE, action, equipment.getId(), side.getNum())); } String reportKey = "network.modification.equipment" + capitalize(action) + (side != null ? ".side" : ""); @@ -1358,11 +1354,10 @@ private void createNewActivePowerControl(ActivePowerControlAdder adder, AttributeModification participateInfo, AttributeModification droopInfo, List reports, - NetworkModificationException.Type exceptionType, String errorMessage) { Boolean participate = Optional.ofNullable(participateInfo).map(AttributeModification::getValue).orElse(null); Float droop = Optional.ofNullable(droopInfo).map(AttributeModification::getValue).orElse(null); - checkActivePowerControl(participate, droop, exceptionType, errorMessage); + checkActivePowerControl(participate, droop, errorMessage); if (participate != null) { adder.withParticipate(participate) .withDroop(droop != null ? droop : Double.NaN) @@ -1374,9 +1369,9 @@ private void createNewActivePowerControl(ActivePowerControlAdder adder, } } - public void checkActivePowerControl(Boolean participate, Float droop, NetworkModificationException.Type exceptionType, String errorMessage) { + public void checkActivePowerControl(Boolean participate, Float droop, String errorMessage) { if (Boolean.TRUE.equals(participate) && droop == null) { - throw new NetworkModificationException(exceptionType, String.format("%s Active power regulation on : missing required droop value", errorMessage)); + throw new NetworkModificationException(String.format("%s Active power regulation on : missing required droop value", errorMessage)); } } @@ -1386,13 +1381,12 @@ public ReportNode modifyActivePowerControlAttributes(ActivePowerControl activ AttributeModification droopInfo, ReportNode subReportNode, ReportNode subReporterSetpoints, - NetworkModificationException.Type exceptionType, String errorMessage) { List reports = new ArrayList<>(); if (activePowerControl != null) { modifyExistingActivePowerControl(activePowerControl, participateInfo, droopInfo, reports); } else { - createNewActivePowerControl(activePowerControlAdder, participateInfo, droopInfo, reports, exceptionType, errorMessage); + createNewActivePowerControl(activePowerControlAdder, participateInfo, droopInfo, reports, errorMessage); } if (subReportNode != null) { ReportNode subReportNodeSetpoints2 = subReporterSetpoints; @@ -1406,8 +1400,8 @@ public ReportNode modifyActivePowerControlAttributes(ActivePowerControl activ } public void checkMaxQGreaterThanMinQ( - List modificationPoints, - NetworkModificationException.Type exceptionType, String errorMessage + List modificationPoints, + String errorMessage ) { for (var point : modificationPoints) { double maxQ = Double.NaN; @@ -1423,44 +1417,42 @@ public void checkMaxQGreaterThanMinQ( if (maxQ < minQ) { throw new NetworkModificationException( - exceptionType, errorMessage + "maximum reactive power " + maxQ + " is expected to be greater than or equal to minimum reactive power " + minQ ); } } } - public void checkMaxReactivePowerGreaterThanMinReactivePower(MinMaxReactiveLimits minMaxReactiveLimits, AttributeModification minimumReactivePowerInfo, AttributeModification maximumReactivePowerInfo, NetworkModificationException.Type exceptionType, String errorMessage) { + public void checkMaxReactivePowerGreaterThanMinReactivePower(MinMaxReactiveLimits minMaxReactiveLimits, AttributeModification minimumReactivePowerInfo, AttributeModification maximumReactivePowerInfo, String errorMessage) { double previousMinimumReactivePower = minMaxReactiveLimits.getMinQ(); double previousMaximumReactivePower = minMaxReactiveLimits.getMaxQ(); double minReactivePower = minimumReactivePowerInfo != null ? minimumReactivePowerInfo.getValue() : previousMinimumReactivePower; double maxReactivePower = maximumReactivePowerInfo != null ? maximumReactivePowerInfo.getValue() : previousMaximumReactivePower; if (minReactivePower > maxReactivePower) { - throw new NetworkModificationException(exceptionType, errorMessage + "maximum reactive power " + maxReactivePower + " is expected to be greater than or equal to minimum reactive power " + minReactivePower); + throw new NetworkModificationException(errorMessage + "maximum reactive power " + maxReactivePower + " is expected to be greater than or equal to minimum reactive power " + minReactivePower); } } public void checkReactiveLimit(ReactiveLimitsHolder reactiveLimitsHolder, AttributeModification minimumReactivePower, AttributeModification maximumReactivePower, - List modificationPoints, NetworkModificationException.Type exeptionType, String errorMessage) { + List modificationPoints, String errorMessage) { if (reactiveLimitsHolder.getReactiveLimits().getKind() == ReactiveLimitsKind.MIN_MAX && (minimumReactivePower != null || maximumReactivePower != null)) { MinMaxReactiveLimits minMaxReactiveLimits = reactiveLimitsHolder.getReactiveLimits(MinMaxReactiveLimits.class); - ModificationUtils.getInstance().checkMaxReactivePowerGreaterThanMinReactivePower(minMaxReactiveLimits, minimumReactivePower, maximumReactivePower, exeptionType, errorMessage); + ModificationUtils.getInstance().checkMaxReactivePowerGreaterThanMinReactivePower(minMaxReactiveLimits, minimumReactivePower, maximumReactivePower, errorMessage); } if (modificationPoints != null) { - ModificationUtils.getInstance().checkMaxQGreaterThanMinQ(modificationPoints, exeptionType, errorMessage); + ModificationUtils.getInstance().checkMaxQGreaterThanMinQ(modificationPoints, errorMessage); } } public void checkEnableRegulation(AttributeModification voltageRegulationType, - AttributeModification regulatingTerminalId, - AttributeModification regulatingTerminalType, - AttributeModification regulatingTerminalVlId, - Terminal localTerminal, - Terminal oldRegulatingTerminal, - Network network, - NetworkModificationException.Type exceptionType, - String errorMessage) { + AttributeModification regulatingTerminalId, + AttributeModification regulatingTerminalType, + AttributeModification regulatingTerminalVlId, + Terminal localTerminal, + Terminal oldRegulatingTerminal, + Network network, + String errorMessage) { // checking if regulating is set to distant if (voltageRegulationType == null || voltageRegulationType.getValue().equals(VoltageRegulationType.LOCAL)) { return; @@ -1478,19 +1470,19 @@ public void checkEnableRegulation(AttributeModification v // all modifications are null // and regulating terminal is null // the regulation should be local or regulating terminal modifications must be provided - throw new NetworkModificationException(exceptionType, errorMessage + "Regulation is set to Distant but regulating terminal is missing"); + throw new NetworkModificationException("Regulation is set to Distant but regulating terminal is missing"); } else if (oldRegulatingTerminal.equals(localTerminal)) { // all modifications are null // and regulating terminal is local // the regulation should be local or regulating terminal modifications must be provided - throw new NetworkModificationException(exceptionType, errorMessage + "Regulation is set to Distant but regulating terminal is local and there is no modification about regulating terminal"); + throw new NetworkModificationException(errorMessage + "Regulation is set to Distant but regulating terminal is local and there is no modification about regulating terminal"); } // all modifications are null but oldRegulatingTerminal is not // we will retrieve the old regulating terminal } else if (isRegulatingTerminalInfoIncomplete) { // at least one information about new regulating terminal is null // meaning regulating terminal modification information is incomplete - throw new NetworkModificationException(exceptionType, errorMessage + "Regulation is set to Distant but regulating terminal information are incomplete"); + throw new NetworkModificationException(errorMessage + "Regulation is set to Distant but regulating terminal information are incomplete"); } else { // regulating terminal modification information is complete // check if the regulating terminal exists @@ -1501,63 +1493,59 @@ public void checkEnableRegulation(AttributeModification v } } - public void checkActivePowerZeroOrBetweenMinAndMaxActivePower(AttributeModification activePowerInfos, AttributeModification minActivePowerInfos, AttributeModification maxActivePowerInfos, Double previousMinActivePower, Double previousMaxActivePower, Double previousActivePower, NetworkModificationException.Type exceptionType, String errorMessage) { + public void checkActivePowerZeroOrBetweenMinAndMaxActivePower(AttributeModification activePowerInfos, AttributeModification minActivePowerInfos, AttributeModification maxActivePowerInfos, Double previousMinActivePower, Double previousMaxActivePower, Double previousActivePower, String errorMessage) { Double minActivePower = minActivePowerInfos != null ? minActivePowerInfos.getValue() : previousMinActivePower; Double maxActivePower = maxActivePowerInfos != null ? maxActivePowerInfos.getValue() : previousMaxActivePower; Double activePower = activePowerInfos != null ? activePowerInfos.getValue() : previousActivePower; if (activePower != 0 && (activePower < minActivePower || activePower > maxActivePower)) { - throw new NetworkModificationException(exceptionType, errorMessage + "Active power " + activePower + " is expected to be equal to 0 or within the range of minimum active power and maximum active power: [" + minActivePower + ", " + maxActivePower + "]"); + throw new NetworkModificationException(errorMessage + "Active power " + activePower + " is expected to be equal to 0 or within the range of minimum active power and maximum active power: [" + minActivePower + ", " + maxActivePower + "]"); } } - private NetworkModificationException makeEquipmentException(NetworkModificationException.Type errorType, - String equipmentId, - String equipmentName, - String msgSuffix) { - return new NetworkModificationException(errorType, - equipmentName + " '" + equipmentId + "' : " + msgSuffix); + private NetworkModificationException makeEquipmentException(String equipmentId, + String equipmentName, + String msgSuffix) { + return new NetworkModificationException(equipmentName + " '" + equipmentId + "' : " + msgSuffix); } private void checkReactiveCapabilityCurvePoints(List points, - NetworkModificationException.Type errorType, String equipmentId, String equipmentName) { if (points.size() < 2) { - throw makeEquipmentException(errorType, equipmentId, equipmentName, "a reactive capability curve should have at least two points"); + throw makeEquipmentException(equipmentId, equipmentName, "a reactive capability curve should have at least two points"); } IntStream.range(0, points.size()) - .forEach(i -> { - ReactiveCapabilityCurvePointsInfos newPoint = points.get(i); - if (newPoint.getP() == null || Double.isNaN(newPoint.getP())) { - throw makeEquipmentException(errorType, equipmentId, equipmentName, "P is not set in a reactive capability curve limits point"); - } else if (newPoint.getMinQ() == null || Double.isNaN(newPoint.getMinQ())) { - throw makeEquipmentException(errorType, equipmentId, equipmentName, "min Q is not set in a reactive capability curve limits point"); - } else if (newPoint.getMaxQ() == null || Double.isNaN(newPoint.getMaxQ())) { - throw makeEquipmentException(errorType, equipmentId, equipmentName, "max Q is not set in a reactive capability curve limits point"); - } - }); + .forEach(i -> { + ReactiveCapabilityCurvePointsInfos newPoint = points.get(i); + if (newPoint.getP() == null || Double.isNaN(newPoint.getP())) { + throw makeEquipmentException(equipmentId, equipmentName, "P is not set in a reactive capability curve limits point"); + } else if (newPoint.getMinQ() == null || Double.isNaN(newPoint.getMinQ())) { + throw makeEquipmentException(equipmentId, equipmentName, "min Q is not set in a reactive capability curve limits point"); + } else if (newPoint.getMaxQ() == null || Double.isNaN(newPoint.getMaxQ())) { + throw makeEquipmentException(equipmentId, equipmentName, "max Q is not set in a reactive capability curve limits point"); + } + }); } public void checkReactiveLimitsCreation(ReactiveLimitsHolderInfos modificationInfos, - NetworkModificationException.Type errorType, String equipmentId, String equipmentName) { // check min max reactive limits if (modificationInfos.getMinQ() != null && modificationInfos.getMaxQ() != null) { if (Double.isNaN(modificationInfos.getMinQ())) { - throw makeEquipmentException(errorType, equipmentId, equipmentName, "minimum reactive power is not set"); + throw makeEquipmentException(equipmentId, equipmentName, "minimum reactive power is not set"); } else if (Double.isNaN(modificationInfos.getMaxQ())) { - throw makeEquipmentException(errorType, equipmentId, equipmentName, "maximum reactive power is not set"); + throw makeEquipmentException(equipmentId, equipmentName, "maximum reactive power is not set"); } else if (modificationInfos.getMaxQ() < modificationInfos.getMinQ()) { - throw makeEquipmentException(errorType, equipmentId, equipmentName, "maximum reactive power is expected to be greater than or equal to minimum reactive power"); + throw makeEquipmentException(equipmentId, equipmentName, "maximum reactive power is expected to be greater than or equal to minimum reactive power"); } } // check reactive capability curve limits List points = modificationInfos.getReactiveCapabilityCurvePoints(); if (!org.apache.commons.collections4.CollectionUtils.isEmpty(points)) { - checkReactiveCapabilityCurvePoints(points, errorType, equipmentId, equipmentName); + checkReactiveCapabilityCurvePoints(points, equipmentId, equipmentName); } } @@ -1565,41 +1553,41 @@ public void checkReactivePowerLimitsAndSetPointsCreation(StaticVarCompensatorCre String equipmentName = "StaticVarCompensator"; // check min max reactive limits if (Objects.isNull(creationInfos.getMinSusceptance()) && Objects.isNull(creationInfos.getMinQAtNominalV())) { - throw makeEquipmentException(creationInfos.getErrorType(), creationInfos.getEquipmentId(), equipmentName, "minimum susceptance is not set"); + throw makeEquipmentException(creationInfos.getEquipmentId(), equipmentName, "minimum susceptance is not set"); } if (Objects.isNull(creationInfos.getMaxSusceptance()) && Objects.isNull(creationInfos.getMaxQAtNominalV())) { - throw makeEquipmentException(creationInfos.getErrorType(), creationInfos.getEquipmentId(), equipmentName, "maximum susceptance is not set"); + throw makeEquipmentException(creationInfos.getEquipmentId(), equipmentName, "maximum susceptance is not set"); } if (Objects.nonNull(creationInfos.getMaxSusceptance()) && Objects.nonNull(creationInfos.getMinSusceptance()) && creationInfos.getMaxSusceptance() < creationInfos.getMinSusceptance()) { - throw makeEquipmentException(creationInfos.getErrorType(), creationInfos.getEquipmentId(), equipmentName, "maximum susceptance is expected to be greater than or equal to minimum susceptance"); + throw makeEquipmentException(creationInfos.getEquipmentId(), equipmentName, "maximum susceptance is expected to be greater than or equal to minimum susceptance"); } if (Objects.nonNull(creationInfos.getMaxQAtNominalV()) && Objects.nonNull(creationInfos.getMinQAtNominalV()) && creationInfos.getMaxQAtNominalV() < creationInfos.getMinQAtNominalV()) { - throw makeEquipmentException(creationInfos.getErrorType(), creationInfos.getEquipmentId(), equipmentName, "maximum Q at nominal voltage is expected to be greater than or equal to minimum Q"); + throw makeEquipmentException(creationInfos.getEquipmentId(), equipmentName, "maximum Q at nominal voltage is expected to be greater than or equal to minimum Q"); } // check set points if (creationInfos.getRegulationMode() == StaticVarCompensator.RegulationMode.VOLTAGE && creationInfos.getVoltageSetpoint() == null) { - throw makeEquipmentException(creationInfos.getErrorType(), creationInfos.getEquipmentId(), equipmentName, "Voltage setpoint is not set"); + throw makeEquipmentException(creationInfos.getEquipmentId(), equipmentName, "Voltage setpoint is not set"); } if (creationInfos.getRegulationMode() == StaticVarCompensator.RegulationMode.REACTIVE_POWER && creationInfos.getReactivePowerSetpoint() == null) { - throw makeEquipmentException(creationInfos.getErrorType(), creationInfos.getEquipmentId(), equipmentName, "Reactive power setpoint is not set"); + throw makeEquipmentException(creationInfos.getEquipmentId(), equipmentName, "Reactive power setpoint is not set"); } } public void checkStandbyAutomatonCreation(StaticVarCompensatorCreationInfos creationInfos) { String equipmentName = "StaticVarCompensator"; if (creationInfos.isStandby() && creationInfos.getRegulationMode() != StaticVarCompensator.RegulationMode.VOLTAGE && !creationInfos.isRegulating()) { - throw makeEquipmentException(creationInfos.getErrorType(), creationInfos.getEquipmentId(), equipmentName, "Standby is only supported in Voltage Regulation mode"); + throw makeEquipmentException(creationInfos.getEquipmentId(), equipmentName, "Standby is only supported in Voltage Regulation mode"); } if (Objects.nonNull(creationInfos.getB0()) && Objects.nonNull(creationInfos.getMinSusceptance()) && Objects.nonNull(creationInfos.getMaxSusceptance()) && - (creationInfos.getB0() < creationInfos.getMinSusceptance() || creationInfos.getB0() > creationInfos.getMaxSusceptance())) { - throw makeEquipmentException(creationInfos.getErrorType(), creationInfos.getEquipmentId(), equipmentName, - "b0 must be within the range of minimum susceptance and maximum susceptance"); + (creationInfos.getB0() < creationInfos.getMinSusceptance() || creationInfos.getB0() > creationInfos.getMaxSusceptance())) { + throw makeEquipmentException(creationInfos.getEquipmentId(), equipmentName, + "b0 must be within the range of minimum susceptance and maximum susceptance"); } if (Objects.nonNull(creationInfos.getQ0()) && Objects.nonNull(creationInfos.getMinQAtNominalV()) && Objects.nonNull(creationInfos.getMaxQAtNominalV()) && - (creationInfos.getQ0() < creationInfos.getMinQAtNominalV() || creationInfos.getQ0() > creationInfos.getMaxQAtNominalV())) { - throw makeEquipmentException(creationInfos.getErrorType(), creationInfos.getEquipmentId(), equipmentName, - "q0 must be within the range of minimum Q and maximum Q"); + (creationInfos.getQ0() < creationInfos.getMinQAtNominalV() || creationInfos.getQ0() > creationInfos.getMaxQAtNominalV())) { + throw makeEquipmentException(creationInfos.getEquipmentId(), equipmentName, + "q0 must be within the range of minimum Q and maximum Q"); } } @@ -1682,13 +1670,12 @@ private void createReactiveCapabilityCurvePoint(ReactiveCapabilityCurveAdder add } public boolean isValidFilter(ReportNode subReportNode, - NetworkModificationException.Type errorType, Map exportFilters) { boolean noValidEquipmentId = exportFilters.values().stream() .allMatch(filterEquipments -> CollectionUtils.isEmpty(filterEquipments.getIdentifiableAttributes())); if (noValidEquipmentId) { - createReport(subReportNode, "network.modification.invalidFilters", Map.of("errorType", errorType), TypedValue.ERROR_SEVERITY); + createReport(subReportNode, "network.modification.invalidFilters", Map.of(), TypedValue.ERROR_SEVERITY); return false; } @@ -1710,10 +1697,10 @@ public static Set getIdentifiableAttributes(Map getUuidFilterEquipmentsMap(IFilterService filterService, Network network, ReportNode subReportNode, Map filters, NetworkModificationException.Type errorType) { + public static Map getUuidFilterEquipmentsMap(IFilterService filterService, Network network, ReportNode subReportNode, Map filters) { Map exportFilters = filterService.getUuidFilterEquipmentsMap(network, filters); - boolean isValidFilter = ModificationUtils.getInstance().isValidFilter(subReportNode, errorType, exportFilters); + boolean isValidFilter = ModificationUtils.getInstance().isValidFilter(subReportNode, exportFilters); return isValidFilter ? exportFilters : null; } @@ -1873,27 +1860,27 @@ public static Double parseDoubleOrNaNIfNull(String value) { return value != null ? Double.parseDouble(value) : Double.NaN; } - public static void checkIsNotNegativeValue(String errorMessage, Double valueToCheck, NetworkModificationException.Type exceptionType, String valueName) throws NetworkModificationException { + public static void checkIsNotNegativeValue(String errorMessage, Double valueToCheck, String valueName) { if (valueToCheck != null && !Double.isNaN(valueToCheck) && valueToCheck < 0) { - throw new NetworkModificationException(exceptionType, errorMessage + "can not have a negative value for " + valueName); + throw new NetworkModificationException(errorMessage + "can not have a negative value for " + valueName); } } - public static void checkIsPercentage(String errorMessage, Float valueToCheck, NetworkModificationException.Type exceptionType, String valueName) throws NetworkModificationException { + public static void checkIsPercentage(String errorMessage, Float valueToCheck, String valueName) { if (valueToCheck != null && (valueToCheck < 0 || valueToCheck > 100)) { - throw new NetworkModificationException(exceptionType, errorMessage + "must have " + valueName + " between 0 and 100"); + throw new NetworkModificationException(errorMessage + "must have " + valueName + " between 0 and 100"); } } - public static void checkIsInInterval(String errorMessage, Float valueToCheck, Pair interval, NetworkModificationException.Type exceptionType, String valueName) throws NetworkModificationException { + public static void checkIsInInterval(String errorMessage, Float valueToCheck, Pair interval, String valueName) { if (valueToCheck != null && (valueToCheck < interval.getFirst() || valueToCheck > interval.getSecond())) { - throw new NetworkModificationException(exceptionType, errorMessage + "must have " + valueName + " " + interval.getFirst() + " and " + interval.getSecond()); + throw new NetworkModificationException(errorMessage + "must have " + valueName + " " + interval.getFirst() + " and " + interval.getSecond()); } } - public static void checkLimitsGroupExist(String errorMessage, String limitsGroupIdToSet, NetworkModificationException.Type exceptionType, List existingOperationalLimitsGroupIds, int side) throws NetworkModificationException { + public static void checkLimitsGroupExist(String errorMessage, String limitsGroupIdToSet, List existingOperationalLimitsGroupIds, int side) { if (StringUtils.hasText(limitsGroupIdToSet) && !existingOperationalLimitsGroupIds.contains(limitsGroupIdToSet)) { - throw new NetworkModificationException(exceptionType, errorMessage + + throw new NetworkModificationException(errorMessage + String.format("missing limit set %s applicable on side %d : equipment ignored", limitsGroupIdToSet, side)); } } diff --git a/src/main/resources/org/gridsuite/modification/reports.properties b/src/main/resources/org/gridsuite/modification/reports.properties index e0d4d054..1e9a53ce 100644 --- a/src/main/resources/org/gridsuite/modification/reports.properties +++ b/src/main/resources/org/gridsuite/modification/reports.properties @@ -171,7 +171,7 @@ network.modification.generatorNotFound.generatorsWithoutOutage = Generators with network.modification.generatorScaling = Generator scaling network.modification.groovyScript = Apply groovy script network.modification.groovyScriptApplied = Groovy script applied -network.modification.invalidFilters = ${errorType}: There is no valid equipment ID among the provided filter(s) +network.modification.invalidFilters = There is no valid equipment ID among the provided filter(s) network.modification.lcc.creation = Lcc creation ${lccId} network.modification.lccCharacteristics = Characteristics network.modification.lccCreated = New lcc with id=${id} created diff --git a/src/test/java/org/gridsuite/modification/modifications/BatteryCreationInBusBreakerTest.java b/src/test/java/org/gridsuite/modification/modifications/BatteryCreationInBusBreakerTest.java index fc308aaf..9613f335 100644 --- a/src/test/java/org/gridsuite/modification/modifications/BatteryCreationInBusBreakerTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/BatteryCreationInBusBreakerTest.java @@ -86,7 +86,7 @@ void testCreateWithBusbarSectionErrors() throws Exception { batteryCreationInfos.setBusOrBusbarSectionId("notFoundBus"); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> batteryCreationInfos.toModification().apply(getNetwork())); - assertEquals("BUS_NOT_FOUND : notFoundBus", exception.getMessage()); + assertEquals("Bus notFoundBus does not exist in network", exception.getMessage()); } @Override diff --git a/src/test/java/org/gridsuite/modification/modifications/BatteryCreationInNodeBreakerTest.java b/src/test/java/org/gridsuite/modification/modifications/BatteryCreationInNodeBreakerTest.java index 529abdf3..82ce5648 100644 --- a/src/test/java/org/gridsuite/modification/modifications/BatteryCreationInNodeBreakerTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/BatteryCreationInNodeBreakerTest.java @@ -55,7 +55,7 @@ public void checkModification() { BatteryCreation batteryCreation1 = (BatteryCreation) batteryCreationInfos1.toModification(); String message = assertThrows(NetworkModificationException.class, () -> batteryCreation1.check(network)).getMessage(); - assertEquals("CREATE_BATTERY_ERROR : Battery 'v4Battery' : must have Droop between 0 and 100", message); + assertEquals("Battery 'v4Battery' : must have Droop between 0 and 100", message); BatteryCreationInfos batteryCreationInfos2 = BatteryCreationInfos.builder() .equipmentId("v4Battery") @@ -66,7 +66,7 @@ public void checkModification() { BatteryCreation batteryCreation2 = (BatteryCreation) batteryCreationInfos2.toModification(); message = assertThrows(NetworkModificationException.class, () -> batteryCreation2.check(network)).getMessage(); - assertEquals("CREATE_BATTERY_ERROR : Battery 'v4Battery' : must have Droop between 0 and 100", message); + assertEquals("Battery 'v4Battery' : must have Droop between 0 and 100", message); BatteryCreationInfos batteryCreationInfos3 = BatteryCreationInfos.builder() .equipmentId("v3Battery") @@ -74,7 +74,7 @@ public void checkModification() { BatteryCreation batteryCreation3 = (BatteryCreation) batteryCreationInfos3.toModification(); message = assertThrows(NetworkModificationException.class, () -> batteryCreation3.check(network)).getMessage(); - assertEquals("BATTERY_ALREADY_EXISTS : v3Battery", message); + assertEquals("Battery already exists: v3Battery", message); } @Override @@ -135,13 +135,13 @@ void testCreateWithErrors() throws Exception { batteryCreationInfos.setEquipmentId("idBattery1"); batteryCreationInfos.setVoltageLevelId("notFoundVoltageLevelId"); exception = assertThrows(NetworkModificationException.class, () -> batteryCreationInfos.toModification().check(getNetwork())); - assertEquals("VOLTAGE_LEVEL_NOT_FOUND : notFoundVoltageLevelId", exception.getMessage()); + assertEquals("Voltage level notFoundVoltageLevelId does not exist in network", exception.getMessage()); // not found busbar section batteryCreationInfos.setVoltageLevelId("v2"); batteryCreationInfos.setBusOrBusbarSectionId("notFoundBusbarSection"); exception = assertThrows(NetworkModificationException.class, () -> batteryCreationInfos.toModification().check(getNetwork())); - assertEquals("BUSBAR_SECTION_NOT_FOUND : notFoundBusbarSection", exception.getMessage()); + assertEquals("Busbar section notFoundBusbarSection does not exist in network", exception.getMessage()); // invalid min active power batteryCreationInfos.setVoltageLevelId("v2"); @@ -157,32 +157,32 @@ void testCreateWithErrors() throws Exception { batteryCreationInfos1.setMinQ(Double.NaN); exception = assertThrows(NetworkModificationException.class, () -> batteryCreationInfos1.toModification().check(getNetwork())); - assertEquals("CREATE_BATTERY_ERROR : Battery 'idBattery1' : minimum reactive power is not set", exception.getMessage()); + assertEquals("Battery 'idBattery1' : minimum reactive power is not set", exception.getMessage()); BatteryCreationInfos batteryCreationInfos2 = (BatteryCreationInfos) buildModification(); batteryCreationInfos2.setReactiveCapabilityCurve(false); batteryCreationInfos2.setMaxQ(Double.NaN); exception = assertThrows(NetworkModificationException.class, () -> batteryCreationInfos2.toModification().check(getNetwork())); - assertEquals("CREATE_BATTERY_ERROR : Battery 'idBattery1' : maximum reactive power is not set", exception.getMessage()); + assertEquals("Battery 'idBattery1' : maximum reactive power is not set", exception.getMessage()); batteryCreationInfos2.setReactiveCapabilityCurve(false); batteryCreationInfos2.setMinQ(200.); batteryCreationInfos2.setMaxQ(100.); exception = assertThrows(NetworkModificationException.class, () -> batteryCreationInfos2.toModification().check(getNetwork())); - assertEquals("CREATE_BATTERY_ERROR : Battery 'idBattery1' : maximum reactive power is expected to be greater than or equal to minimum reactive power", exception.getMessage()); + assertEquals("Battery 'idBattery1' : maximum reactive power is expected to be greater than or equal to minimum reactive power", exception.getMessage()); // invalid reactive capability curve limit BatteryCreationInfos batteryCreationInfos3 = (BatteryCreationInfos) buildModification(); batteryCreationInfos3.getReactiveCapabilityCurvePoints().get(0).setP(Double.NaN); exception = assertThrows(NetworkModificationException.class, () -> batteryCreationInfos3.toModification().check(getNetwork())); - assertEquals("CREATE_BATTERY_ERROR : Battery 'idBattery1' : P is not set in a reactive capability curve limits point", exception.getMessage()); + assertEquals("Battery 'idBattery1' : P is not set in a reactive capability curve limits point", exception.getMessage()); // try to create an existing battery BatteryCreationInfos batteryCreationInfos4 = (BatteryCreationInfos) buildModification(); batteryCreationInfos4.setEquipmentId("v3Battery"); exception = assertThrows(NetworkModificationException.class, () -> batteryCreationInfos4.toModification().check(getNetwork())); - assertEquals("BATTERY_ALREADY_EXISTS : v3Battery", exception.getMessage()); + assertEquals("Battery already exists: v3Battery", exception.getMessage()); } @Override diff --git a/src/test/java/org/gridsuite/modification/modifications/BatteryModificationTest.java b/src/test/java/org/gridsuite/modification/modifications/BatteryModificationTest.java index b146a435..c38f6ff5 100644 --- a/src/test/java/org/gridsuite/modification/modifications/BatteryModificationTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/BatteryModificationTest.java @@ -49,7 +49,7 @@ public void checkModification() { BatteryModification batteryModification1 = (BatteryModification) batteryModificationInfos1.toModification(); String message = assertThrows(NetworkModificationException.class, () -> batteryModification1.check(network)).getMessage(); - assertEquals("MODIFY_BATTERY_ERROR : Battery 'v3Battery' : must have Droop between 0 and 100", message); + assertEquals("Battery 'v3Battery' : must have Droop between 0 and 100", message); BatteryModificationInfos batteryModificationInfos2 = BatteryModificationInfos.builder() .equipmentId("v3Battery") @@ -58,7 +58,7 @@ public void checkModification() { BatteryModification batteryModification2 = (BatteryModification) batteryModificationInfos2.toModification(); message = assertThrows(NetworkModificationException.class, () -> batteryModification2.check(network)).getMessage(); - assertEquals("MODIFY_BATTERY_ERROR : Battery 'v3Battery' : must have Droop between 0 and 100", message); + assertEquals("Battery 'v3Battery' : must have Droop between 0 and 100", message); } @Override @@ -157,7 +157,7 @@ void testActivePowerZeroOrBetweenMinAndMaxActivePower() { NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> batteryModificationInfos.toModification().check(getNetwork())); - assertEquals("MODIFY_BATTERY_ERROR : Battery '" + "v3Battery" + "' : Active power " + activePower + " is expected to be equal to 0 or within the range of minimum active power and maximum active power: [" + minActivePower + ", " + maxActivePower + "]", + assertEquals("Battery '" + "v3Battery" + "' : Active power " + activePower + " is expected to be equal to 0 or within the range of minimum active power and maximum active power: [" + minActivePower + ", " + maxActivePower + "]", exception.getMessage()); } @@ -194,7 +194,7 @@ void testMinQGreaterThanMaxQ() { } NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> batteryModificationInfos.toModification().check(getNetwork())); - assertEquals("MODIFY_BATTERY_ERROR : Battery '" + "v3Battery" + "' : maximum reactive power " + maxQ.get() + assertEquals("Battery '" + "v3Battery" + "' : maximum reactive power " + maxQ.get() + " is expected to be greater than or equal to minimum reactive power " + minQ.get(), exception.getMessage()); } @@ -222,6 +222,6 @@ void testConnectionError() { batteryModificationInfos.setEquipmentId("v3Battery"); batteryModificationInfos.setTerminalConnected(new AttributeModification<>(true, OperationType.SET)); String message = assertThrows(NetworkModificationException.class, () -> batteryModificationInfos.toModification().apply(getNetwork())).getMessage(); - assertEquals("INJECTION_MODIFICATION_ERROR : Could not connect equipment 'v3Battery'", message); + assertEquals("Could not connect equipment 'v3Battery'", message); } } diff --git a/src/test/java/org/gridsuite/modification/modifications/CreateVoltageLevelSectionTest.java b/src/test/java/org/gridsuite/modification/modifications/CreateVoltageLevelSectionTest.java index 8e7a3b19..2b09564e 100644 --- a/src/test/java/org/gridsuite/modification/modifications/CreateVoltageLevelSectionTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/CreateVoltageLevelSectionTest.java @@ -53,23 +53,23 @@ public void checkModification() { assertEquals("CREATE_VOLTAGE_LEVEL_SECTION", modification.getName()); String message = assertThrows(NetworkModificationException.class, () -> modification.check(network)).getMessage(); - assertEquals("BUSBAR_SECTION_NOT_FOUND : 1 is not the busbar index of the busbar section bbs1 in voltage level v1", message); + assertEquals("1 is not the busbar index of the busbar section bbs1 in voltage level v1", message); message = assertThrows(NetworkModificationException.class, () -> modification.check(network)).getMessage(); - assertEquals("BUSBAR_SECTION_NOT_FOUND : 1 is not the busbar index of the busbar section bbs1 in voltage level v1", message); + assertEquals("1 is not the busbar index of the busbar section bbs1 in voltage level v1", message); voltageLevelSectionInfos.setVoltageLevelId("notFoundVoltageLevel"); voltageLevelSectionInfos.setBusbarSectionId("bbs1"); voltageLevelSectionInfos.setBusbarIndex(1); message = assertThrows(NetworkModificationException.class, () -> modification.check(network)).getMessage(); - assertEquals("CREATE_VOLTAGE_LEVEL_ERROR : Voltage level not found: notFoundVoltageLevel", message); + assertEquals("Voltage level not found: notFoundVoltageLevel", message); voltageLevelSectionInfos.setVoltageLevelId("v1"); voltageLevelSectionInfos.setBusbarSectionId("notFoundBusbar"); message = assertThrows(NetworkModificationException.class, () -> modification.check(network)).getMessage(); - assertEquals("BUSBAR_SECTION_NOT_FOUND : notFoundBusbar not found in voltage level v1", message); + assertEquals("notFoundBusbar not found in voltage level v1", message); } @Override diff --git a/src/test/java/org/gridsuite/modification/modifications/CreateVoltageLevelTopologyTest.java b/src/test/java/org/gridsuite/modification/modifications/CreateVoltageLevelTopologyTest.java index a177a5f0..5493a1f7 100644 --- a/src/test/java/org/gridsuite/modification/modifications/CreateVoltageLevelTopologyTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/CreateVoltageLevelTopologyTest.java @@ -32,19 +32,19 @@ public void checkModification() { Network network = getNetwork(); String message = assertThrows(NetworkModificationException.class, () -> modification.check(network)).getMessage(); - assertEquals("CREATE_VOLTAGE_LEVEL_TOPOLOGY_ERROR : Missing required attributes to modify the equipment", message); + assertEquals("Missing required attributes to modify the equipment", message); createVoltageLevelTopologyInfos.setVoltageLevelId("notFoundVoltageLevel"); createVoltageLevelTopologyInfos.setSectionCount(3); createVoltageLevelTopologyInfos.setSwitchKinds(List.of(SwitchKind.DISCONNECTOR)); message = assertThrows(NetworkModificationException.class, () -> modification.check(network)).getMessage(); - assertEquals("CREATE_VOLTAGE_LEVEL_TOPOLOGY_ERROR : The switch kinds list must have a size equal to the section count minus one", message); + assertEquals("The switch kinds list must have a size equal to the section count minus one", message); createVoltageLevelTopologyInfos.setSectionCount(2); message = assertThrows(NetworkModificationException.class, () -> modification.check(network)).getMessage(); - assertEquals("CREATE_VOLTAGE_LEVEL_TOPOLOGY_ERROR : " + "voltage level notFoundVoltageLevel is not found", message); + assertEquals("Voltage level notFoundVoltageLevel is not found", message); } @Override diff --git a/src/test/java/org/gridsuite/modification/modifications/DeleteAttachingLineTest.java b/src/test/java/org/gridsuite/modification/modifications/DeleteAttachingLineTest.java index b322555a..babfb419 100644 --- a/src/test/java/org/gridsuite/modification/modifications/DeleteAttachingLineTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/DeleteAttachingLineTest.java @@ -77,7 +77,7 @@ void createNewLineWithExistingIdTest() throws Exception { DeleteAttachingLineInfos deleteAttachingLineInfos = (DeleteAttachingLineInfos) buildModification(); deleteAttachingLineInfos.setReplacingLine1Id("l2"); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> deleteAttachingLineInfos.toModification().check(getNetwork())); - assertEquals("LINE_ALREADY_EXISTS : l2", exception.getMessage()); + assertEquals("Line already exist: l2", exception.getMessage()); } @Override diff --git a/src/test/java/org/gridsuite/modification/modifications/DeleteVoltageLevelOnLineTest.java b/src/test/java/org/gridsuite/modification/modifications/DeleteVoltageLevelOnLineTest.java index 9960054c..09719308 100644 --- a/src/test/java/org/gridsuite/modification/modifications/DeleteVoltageLevelOnLineTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/DeleteVoltageLevelOnLineTest.java @@ -67,7 +67,7 @@ void createWithInvalidLineIdTest() throws Exception { .replacingLine1Id("replacementLineId") .build(); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> deleteVoltageLevelOnLineInfos.toModification().check(getNetwork())); - assertEquals("LINE_NOT_FOUND : ll", exception.getMessage()); + assertEquals("Line not found: ll", exception.getMessage()); } @Test @@ -76,7 +76,7 @@ void createNewLineWithExistingIdTest() throws Exception { DeleteVoltageLevelOnLineInfos deleteVoltageLevelOnLineInfos = (DeleteVoltageLevelOnLineInfos) buildModification(); deleteVoltageLevelOnLineInfos.setReplacingLine1Id("l2"); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> deleteVoltageLevelOnLineInfos.toModification().check(getNetwork())); - assertEquals("LINE_ALREADY_EXISTS : l2", exception.getMessage()); + assertEquals("Line already exists: l2", exception.getMessage()); } @Override diff --git a/src/test/java/org/gridsuite/modification/modifications/EquipmentAttributeModificationTest.java b/src/test/java/org/gridsuite/modification/modifications/EquipmentAttributeModificationTest.java index 5bfd79e8..7bffbdc0 100644 --- a/src/test/java/org/gridsuite/modification/modifications/EquipmentAttributeModificationTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/EquipmentAttributeModificationTest.java @@ -65,7 +65,7 @@ void testWithErrors() throws Exception { .build(); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> switchStatusModificationInfos.toModification().apply(getNetwork())); - assertEquals("ATTRIBUTE_NOT_EDITABLE : SWITCH attribute 'close' not editable", exception.getMessage()); + assertEquals("SWITCH attribute 'close' not editable", exception.getMessage()); } @Override diff --git a/src/test/java/org/gridsuite/modification/modifications/GenerationDispatchTest.java b/src/test/java/org/gridsuite/modification/modifications/GenerationDispatchTest.java index 9bd44f61..595e5684 100644 --- a/src/test/java/org/gridsuite/modification/modifications/GenerationDispatchTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/GenerationDispatchTest.java @@ -761,12 +761,12 @@ protected void checkModification() { GenerationDispatchInfos modification = buildModification(); modification.setLossCoefficient(150.); NetworkModificationException e = assertThrows(NetworkModificationException.class, () -> modification.toModification().check(getNetwork())); - assertEquals("GENERATION_DISPATCH_ERROR : The loss coefficient must be between 0 and 100", e.getMessage()); + assertEquals("Generation dispatch error: the loss coefficient must be between 0 and 100", e.getMessage()); modification.setLossCoefficient(20.); modification.setDefaultOutageRate(140.); e = assertThrows(NetworkModificationException.class, () -> modification.toModification().check(getNetwork())); - assertEquals("GENERATION_DISPATCH_ERROR : The default outage rate must be between 0 and 100", e.getMessage()); + assertEquals("Generation dispatch error: the default outage rate must be between 0 and 100", e.getMessage()); } @Test diff --git a/src/test/java/org/gridsuite/modification/modifications/GeneratorCreationInBusBreakerTest.java b/src/test/java/org/gridsuite/modification/modifications/GeneratorCreationInBusBreakerTest.java index ef09ea96..9c205005 100644 --- a/src/test/java/org/gridsuite/modification/modifications/GeneratorCreationInBusBreakerTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/GeneratorCreationInBusBreakerTest.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.UUID; -import static org.gridsuite.modification.NetworkModificationException.Type.BUS_NOT_FOUND; import static org.junit.jupiter.api.Assertions.*; /** @@ -43,8 +42,7 @@ protected void checkModification() { generatorCreationInfos.setBusOrBusbarSectionId("notFoundBus"); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> generatorCreationInfos.toModification().check(getNetwork())); - assertEquals(BUS_NOT_FOUND, exception.getType()); - assertEquals("BUS_NOT_FOUND : notFoundBus", exception.getMessage()); + assertEquals("Bus notFoundBus does not exist in network", exception.getMessage()); } @Override @@ -100,7 +98,7 @@ void testCreateWithBusbarSectionErrors() throws Exception { generatorCreationInfos.setBusOrBusbarSectionId("notFoundBus"); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> generatorCreationInfos.toModification().check(getNetwork())); - assertEquals("BUS_NOT_FOUND : notFoundBus", exception.getMessage()); + assertEquals("Bus notFoundBus does not exist in network", exception.getMessage()); } @Test @@ -112,7 +110,7 @@ void testCreateWithRegulatedTerminalError() throws Exception { NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> generatorCreationInfos.toModification().check(getNetwork())); - assertEquals("EQUIPMENT_NOT_FOUND : Equipment with id=titi not found with type LINE", exception.getMessage()); + assertEquals("Equipment with id=titi not found with type LINE", exception.getMessage()); } @Override diff --git a/src/test/java/org/gridsuite/modification/modifications/GeneratorCreationInNodeBreakerTest.java b/src/test/java/org/gridsuite/modification/modifications/GeneratorCreationInNodeBreakerTest.java index 275d051a..49ed2df9 100644 --- a/src/test/java/org/gridsuite/modification/modifications/GeneratorCreationInNodeBreakerTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/GeneratorCreationInNodeBreakerTest.java @@ -105,14 +105,14 @@ protected void checkModification() { generatorCreationInfos.setVoltageLevelId("notFoundVoltageLevelId"); GeneratorCreation generatorCreation1 = (GeneratorCreation) generatorCreationInfos.toModification(); exception = assertThrows(NetworkModificationException.class, () -> generatorCreation1.check(network)); - assertEquals("VOLTAGE_LEVEL_NOT_FOUND : notFoundVoltageLevelId", exception.getMessage()); + assertEquals("Voltage level notFoundVoltageLevelId does not exist in network", exception.getMessage()); // not found busbar section generatorCreationInfos.setVoltageLevelId("v2"); generatorCreationInfos.setBusOrBusbarSectionId("notFoundBusbarSection"); GeneratorCreation generatorCreation2 = (GeneratorCreation) generatorCreationInfos.toModification(); exception = assertThrows(NetworkModificationException.class, () -> generatorCreation2.check(network)); - assertEquals("BUSBAR_SECTION_NOT_FOUND : notFoundBusbarSection", exception.getMessage()); + assertEquals("Busbar section notFoundBusbarSection does not exist in network", exception.getMessage()); // invalid min active power generatorCreationInfos.setVoltageLevelId("v2"); @@ -130,7 +130,7 @@ protected void checkModification() { GeneratorCreation generatorCreation4 = (GeneratorCreation) generatorCreationInfos.toModification(); exception = assertThrows(NetworkModificationException.class, () -> generatorCreation4.check(network)); - assertEquals("CREATE_GENERATOR_ERROR : Generator 'idGenerator1' : minimum reactive power is not set", exception.getMessage()); + assertEquals("Generator 'idGenerator1' : minimum reactive power is not set", exception.getMessage()); generatorCreationInfos.setMinQ(0.0); generatorCreationInfos.setReactiveCapabilityCurve(false); @@ -138,7 +138,7 @@ protected void checkModification() { GeneratorCreation generatorCreation5 = (GeneratorCreation) generatorCreationInfos.toModification(); exception = assertThrows(NetworkModificationException.class, () -> generatorCreation5.check(network)); - assertEquals("CREATE_GENERATOR_ERROR : Generator 'idGenerator1' : maximum reactive power is not set", exception.getMessage()); + assertEquals("Generator 'idGenerator1' : maximum reactive power is not set", exception.getMessage()); generatorCreationInfos.setReactiveCapabilityCurve(false); generatorCreationInfos.setMinQ(200.); @@ -146,7 +146,7 @@ protected void checkModification() { GeneratorCreation generatorCreation6 = (GeneratorCreation) generatorCreationInfos.toModification(); exception = assertThrows(NetworkModificationException.class, () -> generatorCreation6.check(network)); - assertEquals("CREATE_GENERATOR_ERROR : Generator 'idGenerator1' : maximum reactive power is expected to be greater than or equal to minimum reactive power", exception.getMessage()); + assertEquals("Generator 'idGenerator1' : maximum reactive power is expected to be greater than or equal to minimum reactive power", exception.getMessage()); // invalid reactive capability curve limit generatorCreationInfos.setMinQ(20.0); @@ -155,13 +155,13 @@ protected void checkModification() { GeneratorCreation generatorCreation7 = (GeneratorCreation) generatorCreationInfos.toModification(); exception = assertThrows(NetworkModificationException.class, () -> generatorCreation7.check(network)); - assertEquals("CREATE_GENERATOR_ERROR : Generator 'idGenerator1' : P is not set in a reactive capability curve limits point", exception.getMessage()); + assertEquals("Generator 'idGenerator1' : P is not set in a reactive capability curve limits point", exception.getMessage()); // // try to create an existing generator generatorCreationInfos.setEquipmentId("v5generator"); GeneratorCreation generatorCreation8 = (GeneratorCreation) generatorCreationInfos.toModification(); exception = assertThrows(NetworkModificationException.class, () -> generatorCreation8.check(network)); - assertEquals("GENERATOR_ALREADY_EXISTS : v5generator", exception.getMessage()); + assertEquals("Generator already exists: v5generator", exception.getMessage()); GeneratorCreationInfos generatorCreationInfos1 = GeneratorCreationInfos.builder() .equipmentId("v4Generator") @@ -172,7 +172,7 @@ protected void checkModification() { GeneratorCreation generatorCreation9 = (GeneratorCreation) generatorCreationInfos1.toModification(); String message = assertThrows(NetworkModificationException.class, () -> generatorCreation9.check(network)).getMessage(); - assertEquals("CREATE_GENERATOR_ERROR : Generator 'v4Generator' : must have Droop between 0 and 100", message); + assertEquals("Generator 'v4Generator' : must have Droop between 0 and 100", message); GeneratorCreationInfos generatorCreationInfos2 = GeneratorCreationInfos.builder() .equipmentId("v4Generator") @@ -183,7 +183,7 @@ protected void checkModification() { GeneratorCreation generatorCreation10 = (GeneratorCreation) generatorCreationInfos2.toModification(); message = assertThrows(NetworkModificationException.class, () -> generatorCreation10.check(network)).getMessage(); - assertEquals("CREATE_GENERATOR_ERROR : Generator 'v4Generator' : must have Droop between 0 and 100", message); + assertEquals("Generator 'v4Generator' : must have Droop between 0 and 100", message); GeneratorCreationInfos generatorCreationInfos3 = GeneratorCreationInfos.builder() .equipmentId("v4Generator") @@ -194,7 +194,7 @@ protected void checkModification() { GeneratorCreation generatorCreation11 = (GeneratorCreation) generatorCreationInfos3.toModification(); message = assertThrows(NetworkModificationException.class, () -> generatorCreation11.check(network)).getMessage(); - assertEquals("CREATE_GENERATOR_ERROR : Generator 'v4Generator' : can not have a negative value for Target Voltage", message); + assertEquals("Generator 'v4Generator' : can not have a negative value for Target Voltage", message); GeneratorCreationInfos generatorCreationInfos4 = GeneratorCreationInfos.builder() .equipmentId("v4Generator") @@ -205,7 +205,7 @@ protected void checkModification() { GeneratorCreation generatorCreation12 = (GeneratorCreation) generatorCreationInfos4.toModification(); message = assertThrows(NetworkModificationException.class, () -> generatorCreation12.check(network)).getMessage(); - assertEquals("CREATE_GENERATOR_ERROR : Generator 'v4Generator' : can not have a negative value for Rated apparent power", message); + assertEquals("Generator 'v4Generator' : can not have a negative value for Rated apparent power", message); } @Test diff --git a/src/test/java/org/gridsuite/modification/modifications/GeneratorModificationTest.java b/src/test/java/org/gridsuite/modification/modifications/GeneratorModificationTest.java index 90ccef8b..5d1b39ad 100644 --- a/src/test/java/org/gridsuite/modification/modifications/GeneratorModificationTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/GeneratorModificationTest.java @@ -124,7 +124,7 @@ protected void checkModification() { GeneratorModification generatorModification2 = (GeneratorModification) generatorModificationInfos2.toModification(); NetworkModificationException exception2 = assertThrows(NetworkModificationException.class, () -> generatorModification2.check(network)); - assertEquals("MODIFY_GENERATOR_ERROR : Generator 'idGenerator' : Regulation is set to Distant but regulating terminal information are incomplete", + assertEquals("Generator 'idGenerator' : Regulation is set to Distant but regulating terminal information are incomplete", exception2.getMessage()); // check regulating terminal @@ -135,7 +135,7 @@ protected void checkModification() { GeneratorModification generatorModification3 = (GeneratorModification) generatorModificationInfos3.toModification(); NetworkModificationException exception3 = assertThrows(NetworkModificationException.class, () -> generatorModification3.check(network)); - assertEquals("MODIFY_GENERATOR_ERROR : Generator 'idGenerator' : Regulation is set to Distant but regulating terminal is local and there is no modification about regulating terminal", + assertEquals("Generator 'idGenerator' : Regulation is set to Distant but regulating terminal is local and there is no modification about regulating terminal", exception3.getMessage()); // check regulating terminal @@ -153,7 +153,7 @@ protected void checkModification() { GeneratorModification generatorModification5 = (GeneratorModification) generatorModificationInfos5.toModification(); String message = assertThrows(NetworkModificationException.class, () -> generatorModification5.check(network)).getMessage(); - assertEquals("MODIFY_GENERATOR_ERROR : Generator 'idGenerator' : must have Droop between 0 and 100", message); + assertEquals("Generator 'idGenerator' : must have Droop between 0 and 100", message); GeneratorModificationInfos generatorModificationInfos6 = GeneratorModificationInfos.builder() .equipmentId("idGenerator") @@ -162,7 +162,7 @@ protected void checkModification() { GeneratorModification generatorModification6 = (GeneratorModification) generatorModificationInfos6.toModification(); message = assertThrows(NetworkModificationException.class, () -> generatorModification6.check(network)).getMessage(); - assertEquals("MODIFY_GENERATOR_ERROR : Generator 'idGenerator' : must have Droop between 0 and 100", message); + assertEquals("Generator 'idGenerator' : must have Droop between 0 and 100", message); GeneratorModificationInfos generatorModificationInfos7 = GeneratorModificationInfos.builder() .equipmentId("idGenerator") @@ -171,7 +171,7 @@ protected void checkModification() { GeneratorModification generatorModification7 = (GeneratorModification) generatorModificationInfos7.toModification(); message = assertThrows(NetworkModificationException.class, () -> generatorModification7.check(network)).getMessage(); - assertEquals("MODIFY_GENERATOR_ERROR : Generator 'idGenerator' : can not have a negative value for Target Voltage", message); + assertEquals("Generator 'idGenerator' : can not have a negative value for Target Voltage", message); GeneratorModificationInfos generatorModificationInfos8 = GeneratorModificationInfos.builder() .equipmentId("idGenerator") @@ -180,7 +180,7 @@ protected void checkModification() { GeneratorModification generatorModification8 = (GeneratorModification) generatorModificationInfos8.toModification(); message = assertThrows(NetworkModificationException.class, () -> generatorModification8.check(network)).getMessage(); - assertEquals("MODIFY_GENERATOR_ERROR : Generator 'idGenerator' : can not have a negative value for Rated apparent power", message); + assertEquals("Generator 'idGenerator' : can not have a negative value for Rated apparent power", message); } @Test @@ -216,7 +216,7 @@ void testMinQGreaterThanMaxQ() { GeneratorModification generatorModification = (GeneratorModification) generatorModificationInfos.toModification(); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> generatorModification.check(network)); - assertEquals("MODIFY_GENERATOR_ERROR : Generator 'idGenerator' : maximum reactive power 100.0 is expected to be greater than or equal to minimum reactive power 300.0", + assertEquals("Generator 'idGenerator' : maximum reactive power 100.0 is expected to be greater than or equal to minimum reactive power 300.0", exception.getMessage()); } @@ -234,7 +234,7 @@ void testActivePowerZeroOrBetweenMinAndMaxActivePower() { GeneratorModification generatorModification = (GeneratorModification) generatorModificationInfos.toModification(); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> generatorModification.check(network)); - assertEquals("MODIFY_GENERATOR_ERROR : Generator 'idGenerator' : Active power 110.0 is expected to be equal to 0 or within the range of minimum active power and maximum active power: [0.0, 100.0]", + assertEquals("Generator 'idGenerator' : Active power 110.0 is expected to be equal to 0 or within the range of minimum active power and maximum active power: [0.0, 100.0]", exception.getMessage()); } diff --git a/src/test/java/org/gridsuite/modification/modifications/GeneratorScalingTest.java b/src/test/java/org/gridsuite/modification/modifications/GeneratorScalingTest.java index 2dbfe16f..7d9937a2 100644 --- a/src/test/java/org/gridsuite/modification/modifications/GeneratorScalingTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/GeneratorScalingTest.java @@ -173,7 +173,7 @@ void testFilterWithWrongIds() throws Exception { .withResourceBundles(NetworkModificationReportResourceBundle.BASE_NAME) .withMessageTemplate("test").build()); generatorScaling.apply(getNetwork(), report); - assertLogMessage(generatorScalingInfo.getErrorType().name() + ": There is no valid equipment ID among the provided filter(s)", + assertLogMessage("There is no valid equipment ID among the provided filter(s)", "network.modification.invalidFilters", report); } diff --git a/src/test/java/org/gridsuite/modification/modifications/GroovyScriptTest.java b/src/test/java/org/gridsuite/modification/modifications/GroovyScriptTest.java index f061d28b..c399c825 100644 --- a/src/test/java/org/gridsuite/modification/modifications/GroovyScriptTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/GroovyScriptTest.java @@ -13,7 +13,6 @@ import org.gridsuite.modification.utils.NetworkCreation; import java.util.UUID; -import static org.gridsuite.modification.NetworkModificationException.Type.GROOVY_SCRIPT_EMPTY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -46,13 +45,12 @@ protected void checkModification() { groovyScriptInfos.setScript(""); // apply empty groovy script Exception exception = assertThrows(NetworkModificationException.class, () -> groovyScriptInfos.toModification().check(getNetwork())); - assertEquals(new NetworkModificationException(GROOVY_SCRIPT_EMPTY).getMessage(), - exception.getMessage()); + assertEquals("Groovy script empty", exception.getMessage()); groovyScriptInfos.setScript(" "); // apply blank groovy script exception = assertThrows(NetworkModificationException.class, () -> groovyScriptInfos.toModification().check(getNetwork())); - assertEquals(new NetworkModificationException(GROOVY_SCRIPT_EMPTY).getMessage(), + assertEquals("Groovy script empty", exception.getMessage()); groovyScriptInfos.setScript("network.getGenerator('there is no generator').targetP=12\n"); diff --git a/src/test/java/org/gridsuite/modification/modifications/LccCreationInBusBreakerTest.java b/src/test/java/org/gridsuite/modification/modifications/LccCreationInBusBreakerTest.java index f3f74c36..10530914 100644 --- a/src/test/java/org/gridsuite/modification/modifications/LccCreationInBusBreakerTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/LccCreationInBusBreakerTest.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.UUID; -import static org.gridsuite.modification.NetworkModificationException.Type.BUS_NOT_FOUND; import static org.junit.jupiter.api.Assertions.*; /** @@ -118,7 +117,6 @@ protected void checkModification() { LccCreation lccCreation = (LccCreation) lccCreationInfos.toModification(); Network network = getNetwork(); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> lccCreation.check(network)); - assertEquals(BUS_NOT_FOUND, exception.getType()); - assertEquals("BUS_NOT_FOUND : notFoundBus", exception.getMessage()); + assertEquals("Bus notFoundBus does not exist in network", exception.getMessage()); } } diff --git a/src/test/java/org/gridsuite/modification/modifications/LccCreationInNodeBreakerTest.java b/src/test/java/org/gridsuite/modification/modifications/LccCreationInNodeBreakerTest.java index 361e8aa9..41faaeea 100644 --- a/src/test/java/org/gridsuite/modification/modifications/LccCreationInNodeBreakerTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/LccCreationInNodeBreakerTest.java @@ -23,7 +23,6 @@ import java.util.Map; import java.util.UUID; -import static org.gridsuite.modification.NetworkModificationException.Type.VOLTAGE_LEVEL_NOT_FOUND; import static org.junit.jupiter.api.Assertions.*; /** @@ -141,7 +140,7 @@ protected void checkModification() { LccCreation lccCreation = (LccCreation) lccCreationInfos.toModification(); Network network = getNetwork(); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> lccCreation.check(network)); - assertEquals(new NetworkModificationException(VOLTAGE_LEVEL_NOT_FOUND, "notFoundVoltageLevelId").getMessage(), exception.getMessage()); + assertEquals("Voltage level notFoundVoltageLevelId does not exist in network", exception.getMessage()); } } diff --git a/src/test/java/org/gridsuite/modification/modifications/LineAttachToVoltageLevelTest.java b/src/test/java/org/gridsuite/modification/modifications/LineAttachToVoltageLevelTest.java index f41d6186..dd38b3ae 100644 --- a/src/test/java/org/gridsuite/modification/modifications/LineAttachToVoltageLevelTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/LineAttachToVoltageLevelTest.java @@ -18,7 +18,6 @@ import java.util.*; -import static org.gridsuite.modification.NetworkModificationException.Type.*; import static org.junit.jupiter.api.Assertions.*; /** @@ -115,10 +114,9 @@ protected void assertAfterNetworkModificationApplication() { } - private void tryToCreateLineWithExistingId(LineAttachToVoltageLevelInfos tryWithExistingLine, String existingLineId) throws Exception { + private void tryToCreateLineWithExistingId(LineAttachToVoltageLevelInfos tryWithExistingLine, String existingLineId) { NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> tryWithExistingLine.toModification().check(getNetwork())); - assertEquals(new NetworkModificationException(LINE_ALREADY_EXISTS, existingLineId).getMessage(), - exception.getMessage()); + assertEquals("Line already exists: " + existingLineId, exception.getMessage()); } @Override @@ -126,8 +124,7 @@ protected void checkModification() { LineAttachToVoltageLevelInfos lineAttachToAbsentLine = (LineAttachToVoltageLevelInfos) buildModification(); lineAttachToAbsentLine.setLineToAttachToId("absent_line_id"); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> lineAttachToAbsentLine.toModification().check(getNetwork())); - assertEquals(new NetworkModificationException(LINE_NOT_FOUND, "absent_line_id").getMessage(), - exception.getMessage()); + assertEquals("Line not found: absent_line_id", exception.getMessage()); } @Test @@ -148,8 +145,7 @@ void testCreateWithExistingEquipments() throws Exception { LineAttachToVoltageLevelInfos tryWithAttachmentPointId = (LineAttachToVoltageLevelInfos) buildModification(); tryWithAttachmentPointId.setAttachmentPointId("v5"); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> tryWithAttachmentPointId.toModification().check(getNetwork())); - assertEquals(new NetworkModificationException(VOLTAGE_LEVEL_ALREADY_EXISTS, "v5").getMessage(), - exception.getMessage()); + assertEquals("Voltage level already exists: v5", exception.getMessage()); } @Override diff --git a/src/test/java/org/gridsuite/modification/modifications/LineCreationInBusBreakerTest.java b/src/test/java/org/gridsuite/modification/modifications/LineCreationInBusBreakerTest.java index e4ddf950..95db2f97 100644 --- a/src/test/java/org/gridsuite/modification/modifications/LineCreationInBusBreakerTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/LineCreationInBusBreakerTest.java @@ -23,7 +23,6 @@ import java.util.Set; import java.util.UUID; -import static org.gridsuite.modification.NetworkModificationException.Type.BUS_NOT_FOUND; import static org.gridsuite.modification.dto.OperationalLimitsGroupInfos.Applicability.SIDE1; import static org.gridsuite.modification.dto.OperationalLimitsGroupInfos.Applicability.SIDE2; import static org.junit.jupiter.api.Assertions.*; @@ -45,8 +44,7 @@ protected void checkModification() { LineCreationInfos lineCreationInfos = (LineCreationInfos) buildModification(); lineCreationInfos.setBusOrBusbarSectionId2("notFoundBus"); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> lineCreationInfos.toModification().check(getNetwork())); - assertEquals(new NetworkModificationException(BUS_NOT_FOUND, "notFoundBus").getMessage(), - exception.getMessage()); + assertEquals("Bus notFoundBus does not exist in network", exception.getMessage()); } @Test diff --git a/src/test/java/org/gridsuite/modification/modifications/LineCreationInNodeBreakerTest.java b/src/test/java/org/gridsuite/modification/modifications/LineCreationInNodeBreakerTest.java index ee39d70d..604a13fd 100644 --- a/src/test/java/org/gridsuite/modification/modifications/LineCreationInNodeBreakerTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/LineCreationInNodeBreakerTest.java @@ -20,7 +20,6 @@ import java.util.Map; import java.util.UUID; -import static org.gridsuite.modification.NetworkModificationException.Type.*; import static org.junit.jupiter.api.Assertions.*; /** @@ -38,15 +37,13 @@ protected void checkModification() { lineCreationInfos.setVoltageLevelId1("notFoundVoltageLevelId1"); LineCreation lineCreation = (LineCreation) lineCreationInfos.toModification(); Exception exception = assertThrows(NetworkModificationException.class, () -> lineCreation.check(network)); - assertEquals(new NetworkModificationException(VOLTAGE_LEVEL_NOT_FOUND, "notFoundVoltageLevelId1").getMessage(), - exception.getMessage()); + assertEquals("Voltage level notFoundVoltageLevelId1 does not exist in network", exception.getMessage()); lineCreationInfos.setVoltageLevelId1("v1"); lineCreationInfos.setBusOrBusbarSectionId1("notFoundBusbarSection1"); LineCreation lineCreation1 = (LineCreation) lineCreationInfos.toModification(); exception = assertThrows(NetworkModificationException.class, () -> lineCreation1.check(network)); - assertEquals(new NetworkModificationException(BUSBAR_SECTION_NOT_FOUND, "notFoundBusbarSection1").getMessage(), - exception.getMessage()); + assertEquals("Busbar section notFoundBusbarSection1 does not exist in network", exception.getMessage()); lineCreationInfos.setVoltageLevelId1("v1"); lineCreationInfos.setBusOrBusbarSectionId1("1.1"); @@ -65,8 +62,7 @@ protected void checkModification() { lineCreationInfos.setEquipmentId("line2"); LineCreation lineCreation4 = (LineCreation) lineCreationInfos.toModification(); exception = assertThrows(NetworkModificationException.class, () -> lineCreation4.check(network)); - assertEquals(new NetworkModificationException(LINE_ALREADY_EXISTS, "line2").getMessage(), - exception.getMessage()); + assertEquals("line already exists: line2", exception.getMessage()); LineCreationInfos lineCreationInfos1 = LineCreationInfos.builder() .equipmentId("line8") @@ -79,7 +75,7 @@ protected void checkModification() { LineCreation lineCreation5 = (LineCreation) lineCreationInfos1.toModification(); String message = assertThrows(NetworkModificationException.class, () -> lineCreation5.check(network)).getMessage(); - assertEquals("CREATE_LINE_ERROR : Line 'line8' : can not have a negative value for Resistance R", message); + assertEquals("Line 'line8' : can not have a negative value for Resistance R", message); LineCreationInfos lineCreationInfos2 = LineCreationInfos.builder() .equipmentId("line8") @@ -92,7 +88,7 @@ protected void checkModification() { LineCreation lineCreation6 = (LineCreation) lineCreationInfos2.toModification(); message = assertThrows(NetworkModificationException.class, () -> lineCreation6.check(network)).getMessage(); - assertEquals("CREATE_LINE_ERROR : Line 'line8' : can not have a negative value for Conductance on side 1 G1", message); + assertEquals("Line 'line8' : can not have a negative value for Conductance on side 1 G1", message); LineCreationInfos lineCreationInfos3 = LineCreationInfos.builder() .equipmentId("line8") @@ -105,7 +101,7 @@ protected void checkModification() { LineCreation lineCreation7 = (LineCreation) lineCreationInfos3.toModification(); message = assertThrows(NetworkModificationException.class, () -> lineCreation7.check(network)).getMessage(); - assertEquals("CREATE_LINE_ERROR : Line 'line8' : can not have a negative value for Conductance on side 2 G2", message); + assertEquals("Line 'line8' : can not have a negative value for Conductance on side 2 G2", message); } @Override diff --git a/src/test/java/org/gridsuite/modification/modifications/LineModificationTest.java b/src/test/java/org/gridsuite/modification/modifications/LineModificationTest.java index 51fd53da..1640f7e7 100644 --- a/src/test/java/org/gridsuite/modification/modifications/LineModificationTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/LineModificationTest.java @@ -24,7 +24,6 @@ import java.util.*; import static org.assertj.core.api.Assertions.assertThat; -import static org.gridsuite.modification.NetworkModificationException.Type.LINE_NOT_FOUND; import static org.gridsuite.modification.dto.OperationalLimitsGroupInfos.Applicability.*; import static org.gridsuite.modification.dto.OperationalLimitsGroupModificationType.DELETE; import static org.gridsuite.modification.dto.OperationalLimitsGroupModificationType.MODIFY_OR_ADD; @@ -127,7 +126,7 @@ protected void checkModification() { lineModificationInfos.setEquipmentId("lineNotFound"); LineModification lineModification = (LineModification) lineModificationInfos.toModification(); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> lineModification.check(network)); - assertEquals(new NetworkModificationException(LINE_NOT_FOUND, "Line 'lineNotFound' : does not exist in network").getMessage(), + assertEquals(new NetworkModificationException("Line 'lineNotFound' : does not exist in network").getMessage(), exception.getMessage()); LineModificationInfos lineModificationInfos1 = LineModificationInfos.builder() .equipmentId("line1") @@ -136,7 +135,7 @@ protected void checkModification() { LineModification lineModification1 = (LineModification) lineModificationInfos1.toModification(); String message = assertThrows(NetworkModificationException.class, () -> lineModification1.check(network)).getMessage(); - assertEquals("MODIFY_LINE_ERROR : Line 'line1' : can not have a negative value for Resistance R", message); + assertEquals("Line 'line1' : can not have a negative value for Resistance R", message); LineModificationInfos lineModificationInfos2 = LineModificationInfos.builder() .equipmentId("line1") @@ -145,7 +144,7 @@ protected void checkModification() { LineModification lineModification2 = (LineModification) lineModificationInfos2.toModification(); message = assertThrows(NetworkModificationException.class, () -> lineModification2.check(network)).getMessage(); - assertEquals("MODIFY_LINE_ERROR : Line 'line1' : can not have a negative value for Conductance on side 1 G1", message); + assertEquals("Line 'line1' : can not have a negative value for Conductance on side 1 G1", message); LineModificationInfos lineModificationInfos3 = LineModificationInfos.builder() .equipmentId("line1") @@ -154,7 +153,7 @@ protected void checkModification() { LineModification lineModification3 = (LineModification) lineModificationInfos3.toModification(); message = assertThrows(NetworkModificationException.class, () -> lineModification3.check(network)).getMessage(); - assertEquals("MODIFY_LINE_ERROR : Line 'line1' : can not have a negative value for Conductance on side 2 G2", message); + assertEquals("Line 'line1' : can not have a negative value for Conductance on side 2 G2", message); } @Override @@ -327,17 +326,17 @@ void testConnectWhenNoSwitchesOpened() { getNetwork().getSwitch("v3dl1").setOpen(true); getNetwork().getSwitch("v3bl1").setOpen(true); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> changeLineConnectionState(getNetwork().getLine("line1"), true)); - assertEquals("BRANCH_MODIFICATION_ERROR : Could not connect equipment 'line1' on side 1", exception.getMessage()); + assertEquals("Could not connect equipment 'line1' on side 1", exception.getMessage()); getNetwork().getSwitch("v3dl1").setOpen(false); getNetwork().getSwitch("v3bl1").setOpen(false); getNetwork().getSwitch("v4dl1").setOpen(true); getNetwork().getSwitch("v4bl1").setOpen(true); exception = assertThrows(NetworkModificationException.class, () -> changeLineConnectionState(getNetwork().getLine("line1"), true)); - assertEquals("BRANCH_MODIFICATION_ERROR : Could not connect equipment 'line1' on side 2", exception.getMessage()); + assertEquals("Could not connect equipment 'line1' on side 2", exception.getMessage()); getNetwork().getSwitch("v3dl1").setOpen(true); getNetwork().getSwitch("v3bl1").setOpen(true); exception = assertThrows(NetworkModificationException.class, () -> changeLineConnectionState(getNetwork().getLine("line1"), true)); - assertEquals("BRANCH_MODIFICATION_ERROR : Could not connect equipment 'line1' on side 1 & 2", exception.getMessage()); + assertEquals("Could not connect equipment 'line1' on side 1 & 2", exception.getMessage()); } @Test diff --git a/src/test/java/org/gridsuite/modification/modifications/LineSplitWithNewVoltageLevelTest.java b/src/test/java/org/gridsuite/modification/modifications/LineSplitWithNewVoltageLevelTest.java index 6693022e..8bbc6a0f 100644 --- a/src/test/java/org/gridsuite/modification/modifications/LineSplitWithNewVoltageLevelTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/LineSplitWithNewVoltageLevelTest.java @@ -9,8 +9,8 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.powsybl.iidm.network.Network; import com.powsybl.iidm.network.SwitchKind; -import com.powsybl.iidm.network.VoltageLevel; import org.gridsuite.modification.NetworkModificationException; +import com.powsybl.iidm.network.VoltageLevel; import org.gridsuite.modification.dto.*; import org.gridsuite.modification.utils.NetworkCreation; import java.util.Arrays; @@ -18,7 +18,6 @@ import java.util.Map; import java.util.UUID; -import static org.gridsuite.modification.NetworkModificationException.Type.LINE_NOT_FOUND; import static org.junit.jupiter.api.Assertions.*; /** @@ -31,8 +30,7 @@ protected void checkModification() { LineSplitWithVoltageLevelInfos lineSplitAbsentLine = (LineSplitWithVoltageLevelInfos) buildModification(); lineSplitAbsentLine.setLineToSplitId("absent_line_id"); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> lineSplitAbsentLine.toModification().check(getNetwork())); - assertEquals(new NetworkModificationException(LINE_NOT_FOUND, "absent_line_id").getMessage(), - exception.getMessage()); + assertEquals("Line not found: absent_line_id", exception.getMessage()); } @Override diff --git a/src/test/java/org/gridsuite/modification/modifications/LineSplitWithVoltageLevelTest.java b/src/test/java/org/gridsuite/modification/modifications/LineSplitWithVoltageLevelTest.java index c11ef536..7eae97d3 100644 --- a/src/test/java/org/gridsuite/modification/modifications/LineSplitWithVoltageLevelTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/LineSplitWithVoltageLevelTest.java @@ -15,8 +15,6 @@ import java.util.Map; import java.util.UUID; -import static org.gridsuite.modification.NetworkModificationException.Type.BUSBAR_SECTION_NOT_FOUND; -import static org.gridsuite.modification.NetworkModificationException.Type.LINE_ALREADY_EXISTS; import static org.junit.jupiter.api.Assertions.*; /** @@ -58,30 +56,27 @@ protected void checkModification() { LineSplitWithVoltageLevelInfos tryWithNewLine1Id = (LineSplitWithVoltageLevelInfos) buildModification(); tryWithNewLine1Id.setNewLine1Id("line1"); Exception exception = assertThrows(NetworkModificationException.class, () -> tryWithNewLine1Id.toModification().check(getNetwork())); - assertEquals(new NetworkModificationException(LINE_ALREADY_EXISTS, "line1").getMessage(), + assertEquals("Line already exists: line1", exception.getMessage()); // same test with "newLine2Id" LineSplitWithVoltageLevelInfos tryWithNewLine2Id = (LineSplitWithVoltageLevelInfos) buildModification(); tryWithNewLine2Id.setNewLine2Id("line1"); exception = assertThrows(NetworkModificationException.class, () -> tryWithNewLine2Id.toModification().check(getNetwork())); - assertEquals(new NetworkModificationException(LINE_ALREADY_EXISTS, "line1").getMessage(), - exception.getMessage()); + assertEquals("Line already exists: line1", exception.getMessage()); // testCreateWithWrongBusBar // not existing busbar LineSplitWithVoltageLevelInfos tryWithBadId = (LineSplitWithVoltageLevelInfos) buildModification(); tryWithBadId.setBbsOrBusId("999A"); exception = assertThrows(NetworkModificationException.class, () -> tryWithBadId.toModification().check(getNetwork())); - assertEquals(new NetworkModificationException(BUSBAR_SECTION_NOT_FOUND, "999A").getMessage(), - exception.getMessage()); + assertEquals("Busbar section 999A does not exist in network", exception.getMessage()); // try with a switch, not a busbar LineSplitWithVoltageLevelInfos tryWithSwitchId = (LineSplitWithVoltageLevelInfos) buildModification(); tryWithSwitchId.setBbsOrBusId("v1d1"); exception = assertThrows(NetworkModificationException.class, () -> tryWithSwitchId.toModification().check(getNetwork())); - assertEquals(new NetworkModificationException(BUSBAR_SECTION_NOT_FOUND, "v1d1").getMessage(), - exception.getMessage()); + assertEquals("Busbar section v1d1 does not exist in network", exception.getMessage()); } @Override diff --git a/src/test/java/org/gridsuite/modification/modifications/LinesAttachToSplitLinesTest.java b/src/test/java/org/gridsuite/modification/modifications/LinesAttachToSplitLinesTest.java index 98045358..3d1c8fd1 100644 --- a/src/test/java/org/gridsuite/modification/modifications/LinesAttachToSplitLinesTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/LinesAttachToSplitLinesTest.java @@ -15,8 +15,6 @@ import java.util.Map; import java.util.UUID; -import static org.gridsuite.modification.NetworkModificationException.Type.LINE_ALREADY_EXISTS; -import static org.gridsuite.modification.NetworkModificationException.Type.LINE_NOT_FOUND; import static org.junit.jupiter.api.Assertions.*; /** @@ -66,20 +64,17 @@ protected void checkModification() { LinesAttachToSplitLinesInfos linesAttachToSplitLinesInfos = (LinesAttachToSplitLinesInfos) buildModification(); linesAttachToSplitLinesInfos.setLineToAttachTo1Id("absent_line_id"); Exception exception = assertThrows(NetworkModificationException.class, () -> linesAttachToSplitLinesInfos.toModification().check(getNetwork())); - assertEquals(new NetworkModificationException(LINE_NOT_FOUND, "absent_line_id").getMessage(), - exception.getMessage()); + assertEquals("Line not found: absent_line_id", exception.getMessage()); // try to create an already existing line LinesAttachToSplitLinesInfos linesAttachToSplitLinesInfos1 = (LinesAttachToSplitLinesInfos) buildModification(); linesAttachToSplitLinesInfos1.setReplacingLine1Id("l1"); exception = assertThrows(NetworkModificationException.class, () -> linesAttachToSplitLinesInfos1.toModification().check(getNetwork())); - assertEquals(new NetworkModificationException(LINE_ALREADY_EXISTS, "l1").getMessage(), - exception.getMessage()); + assertEquals("Line already exists: l1", exception.getMessage()); // same test on 'replacingLine2Id' LinesAttachToSplitLinesInfos linesAttachToSplitLinesInfos2 = (LinesAttachToSplitLinesInfos) buildModification(); linesAttachToSplitLinesInfos2.setReplacingLine2Id("l1"); exception = assertThrows(NetworkModificationException.class, () -> linesAttachToSplitLinesInfos2.toModification().check(getNetwork())); - assertEquals(new NetworkModificationException(LINE_ALREADY_EXISTS, "l1").getMessage(), - exception.getMessage()); + assertEquals("Line already exists: l1", exception.getMessage()); } @Override diff --git a/src/test/java/org/gridsuite/modification/modifications/LoadCreationInNodeBreakerTest.java b/src/test/java/org/gridsuite/modification/modifications/LoadCreationInNodeBreakerTest.java index a7e06eb1..3e4ea5b7 100644 --- a/src/test/java/org/gridsuite/modification/modifications/LoadCreationInNodeBreakerTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/LoadCreationInNodeBreakerTest.java @@ -20,8 +20,6 @@ import java.util.Map; import java.util.UUID; -import static org.gridsuite.modification.NetworkModificationException.Type.BUSBAR_SECTION_NOT_FOUND; -import static org.gridsuite.modification.NetworkModificationException.Type.VOLTAGE_LEVEL_NOT_FOUND; import static org.junit.jupiter.api.Assertions.*; /** @@ -37,13 +35,13 @@ protected void checkModification() { // VoltageLevel not found loadCreationInfos.setVoltageLevelId("notFoundVoltageLevelId"); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> loadCreationInfos.toModification().check(getNetwork())); - assertEquals(new NetworkModificationException(VOLTAGE_LEVEL_NOT_FOUND, "notFoundVoltageLevelId").getMessage(), exception.getMessage()); + assertEquals("Voltage level notFoundVoltageLevelId does not exist in network", exception.getMessage()); loadCreationInfos.setEquipmentId("idLoad1"); loadCreationInfos.setVoltageLevelId("v2"); loadCreationInfos.setBusOrBusbarSectionId("notFoundBusbarSection"); exception = assertThrows(NetworkModificationException.class, () -> loadCreationInfos.toModification().check(getNetwork())); - assertEquals(new NetworkModificationException(BUSBAR_SECTION_NOT_FOUND, "notFoundBusbarSection").getMessage(), exception.getMessage()); + assertEquals("Busbar section notFoundBusbarSection does not exist in network", exception.getMessage()); loadCreationInfos.setBusOrBusbarSectionId("1B"); loadCreationInfos.setP0(Double.NaN); diff --git a/src/test/java/org/gridsuite/modification/modifications/LoadScalingTest.java b/src/test/java/org/gridsuite/modification/modifications/LoadScalingTest.java index 898bbac8..410bea6a 100644 --- a/src/test/java/org/gridsuite/modification/modifications/LoadScalingTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/LoadScalingTest.java @@ -175,7 +175,7 @@ void testFilterWithWrongIds() throws Exception { .withResourceBundles(NetworkModificationReportResourceBundle.BASE_NAME) .withMessageTemplate("test").build()); loadScaling.apply(getNetwork(), report); - assertLogMessage(loadScalingInfo.getErrorType().name() + ": There is no valid equipment ID among the provided filter(s)", + assertLogMessage("There is no valid equipment ID among the provided filter(s)", "network.modification.invalidFilters", report); } diff --git a/src/test/java/org/gridsuite/modification/modifications/ModificationUtilsTest.java b/src/test/java/org/gridsuite/modification/modifications/ModificationUtilsTest.java index 2e3eb846..16a56fb3 100644 --- a/src/test/java/org/gridsuite/modification/modifications/ModificationUtilsTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/ModificationUtilsTest.java @@ -16,7 +16,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchRuntimeException; -import static org.gridsuite.modification.NetworkModificationException.Type.MODIFY_GENERATOR_ERROR; /** * @author David SARTORI @@ -29,48 +28,39 @@ void testCheckMaxQGreaterThanMinQ() { var point1 = ReactiveCapabilityCurvePointsInfos.builder().minQ(10.0).maxQ(20.0).build(); ModificationUtils.getInstance().checkMaxQGreaterThanMinQ( Collections.singletonList(point1), - MODIFY_GENERATOR_ERROR, "old KO, new OK: No exception should be thrown"); var point2 = ReactiveCapabilityCurvePointsInfos.builder().minQ(20.0).maxQ(10.0).build(); var exception = (NetworkModificationException) catchRuntimeException(() -> ModificationUtils.getInstance().checkMaxQGreaterThanMinQ( Collections.singletonList(point2), - MODIFY_GENERATOR_ERROR, "old OK, new KO: ") ); - assertThat(exception.getType()).isEqualTo(MODIFY_GENERATOR_ERROR); assertThat(exception) .hasMessageEndingWith("old OK, new KO: maximum reactive power 10.0 is expected to be greater than or equal to minimum reactive power 20.0"); var point3 = ReactiveCapabilityCurvePointsInfos.builder().minQ(20.0).maxQ(10.0).build(); exception = (NetworkModificationException) catchRuntimeException(() -> ModificationUtils.getInstance().checkMaxQGreaterThanMinQ( Collections.singletonList(point3), - MODIFY_GENERATOR_ERROR, "old null, new KO: ") ); - assertThat(exception.getType()).isEqualTo(MODIFY_GENERATOR_ERROR); assertThat(exception) .hasMessageEndingWith("old null, new KO: maximum reactive power 10.0 is expected to be greater than or equal to minimum reactive power 20.0"); var point4 = ReactiveCapabilityCurvePointsInfos.builder().minQ(10.0).maxQ(20.0).build(); ModificationUtils.getInstance().checkMaxQGreaterThanMinQ( Collections.singletonList(point4), - MODIFY_GENERATOR_ERROR, "old null, new OK: No exception should be thrown"); var point5 = ReactiveCapabilityCurvePointsInfos.builder().minQ(10.0).maxQ(20.0).build(); ModificationUtils.getInstance().checkMaxQGreaterThanMinQ( Collections.singletonList(point5), - MODIFY_GENERATOR_ERROR, "old OK, new null: No exception should be thrown"); var point6 = ReactiveCapabilityCurvePointsInfos.builder().minQ(20.0).maxQ(10.0).build(); exception = (NetworkModificationException) catchRuntimeException(() -> ModificationUtils.getInstance().checkMaxQGreaterThanMinQ( Collections.singletonList(point6), - MODIFY_GENERATOR_ERROR, "old KO, new null: ") ); - assertThat(exception.getType()).isEqualTo(MODIFY_GENERATOR_ERROR); assertThat(exception) .hasMessageEndingWith("old KO, new null: maximum reactive power 10.0 is expected to be greater than or equal to minimum reactive power 20.0"); } diff --git a/src/test/java/org/gridsuite/modification/modifications/MoveVoltageLevelFeederBaysTest.java b/src/test/java/org/gridsuite/modification/modifications/MoveVoltageLevelFeederBaysTest.java index 4074beba..144201af 100644 --- a/src/test/java/org/gridsuite/modification/modifications/MoveVoltageLevelFeederBaysTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/MoveVoltageLevelFeederBaysTest.java @@ -113,7 +113,7 @@ private void testVoltageLevelNotFound(Network network) { .build(); MoveVoltageLevelFeederBays moveVoltageLevelFeederBays = (MoveVoltageLevelFeederBays) moveVoltageLevelFeederBaysInfos.toModification(); String message = assertThrows(NetworkModificationException.class, () -> moveVoltageLevelFeederBays.check(network)).getMessage(); - assertEquals("MOVE_VOLTAGE_LEVEL_FEEDER_BAYS_ERROR : Voltage level notFound is not found", message); + assertEquals("Voltage level notFound is not found", message); } private void testBusBarNotFound(Network network) { @@ -132,7 +132,7 @@ private void testBusBarNotFound(Network network) { .build(); MoveVoltageLevelFeederBays moveVoltageLevelFeederBays = (MoveVoltageLevelFeederBays) moveVoltageLevelFeederBaysInfos.toModification(); String message = assertThrows(NetworkModificationException.class, () -> moveVoltageLevelFeederBays.check(network)).getMessage(); - assertEquals("MOVE_VOLTAGE_LEVEL_FEEDER_BAYS_ERROR : Bus or busbar section notFound where connectable v3load is supposed to be is not found in voltage level v3", message); + assertEquals("Bus or busbar section notFound where connectable v3load is supposed to be is not found in voltage level v3", message); } private void testConnectableNotFound(Network network) { @@ -169,7 +169,7 @@ private void testConnectableNotInjectionOrBranch(Network network) { .build(); MoveVoltageLevelFeederBays moveVoltageLevelFeederBays = (MoveVoltageLevelFeederBays) moveVoltageLevelFeederBaysInfos.toModification(); String message = assertThrows(NetworkModificationException.class, () -> moveVoltageLevelFeederBays.check(network)).getMessage(); - assertEquals("MOVE_VOLTAGE_LEVEL_FEEDER_BAYS_ERROR : MoveVoltageLevelFeederBays is not implemented for class com.powsybl.network.store.iidm.impl.ThreeWindingsTransformerImpl", message); + assertEquals("MoveVoltageLevelFeederBays is not implemented for class com.powsybl.network.store.iidm.impl.ThreeWindingsTransformerImpl", message); } @Override @@ -198,7 +198,7 @@ void testGetTerminal() { MoveVoltageLevelFeederBays moveVoltageLevelFeederBays = (MoveVoltageLevelFeederBays) moveVoltageLevelFeederBaysInfos.toModification(); assertEquals("MOVE_VOLTAGE_LEVEL_FEEDER_BAYS", moveVoltageLevelFeederBays.getName()); String message = assertThrows(NetworkModificationException.class, () -> moveVoltageLevelFeederBays.getTerminal(network, transformerInfo)).getMessage(); - assertEquals("MOVE_VOLTAGE_LEVEL_FEEDER_BAYS_ERROR : MoveVoltageLevelFeederBays is not implemented for class com.powsybl.network.store.iidm.impl.ThreeWindingsTransformerImpl", message); + assertEquals("MoveVoltageLevelFeederBays is not implemented for class com.powsybl.network.store.iidm.impl.ThreeWindingsTransformerImpl", message); MoveFeederBayInfos invalidSideInfo = MoveFeederBayInfos.builder() .equipmentId("line1") .busbarSectionId("random") @@ -208,7 +208,7 @@ void testGetTerminal() { .connectionDirection(ConnectablePosition.Direction.TOP) .build(); message = assertThrows(NetworkModificationException.class, () -> moveVoltageLevelFeederBays.getTerminal(network, invalidSideInfo)).getMessage(); - assertEquals("MOVE_VOLTAGE_LEVEL_FEEDER_BAYS_ERROR : Invalid connection side: THREE for branch line1", message); + assertEquals("Invalid connection side: THREE for branch line1", message); MoveFeederBayInfos injectionInfo = MoveFeederBayInfos.builder() .equipmentId("v3Battery") .busbarSectionId("3A") diff --git a/src/test/java/org/gridsuite/modification/modifications/OperatingStatusModificationEnergiseSideOneLineTest.java b/src/test/java/org/gridsuite/modification/modifications/OperatingStatusModificationEnergiseSideOneLineTest.java index 3534929a..cd23436c 100644 --- a/src/test/java/org/gridsuite/modification/modifications/OperatingStatusModificationEnergiseSideOneLineTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/OperatingStatusModificationEnergiseSideOneLineTest.java @@ -74,7 +74,7 @@ protected void checkModification() { OperatingStatusModificationInfos modificationInfos = (OperatingStatusModificationInfos) buildModification(); modificationInfos.setEquipmentId("cantdisconnect"); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> modificationInfos.toModification().apply(getNetwork())); - assertEquals("OPERATING_STATUS_MODIFICATION_ERROR : Unable to energise equipment end", exception.getMessage()); + assertEquals("Unable to energise equipment end", exception.getMessage()); } diff --git a/src/test/java/org/gridsuite/modification/modifications/OperatingStatusModificationEnergiseSideTwoLineTest.java b/src/test/java/org/gridsuite/modification/modifications/OperatingStatusModificationEnergiseSideTwoLineTest.java index ee1fb9a7..b6781dca 100644 --- a/src/test/java/org/gridsuite/modification/modifications/OperatingStatusModificationEnergiseSideTwoLineTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/OperatingStatusModificationEnergiseSideTwoLineTest.java @@ -74,7 +74,7 @@ protected void checkModification() { OperatingStatusModificationInfos modificationInfos = (OperatingStatusModificationInfos) buildModification(); modificationInfos.setEquipmentId("cantdisconnect"); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> modificationInfos.toModification().apply(getNetwork())); - assertEquals("OPERATING_STATUS_MODIFICATION_ERROR : Unable to energise equipment end", exception.getMessage()); + assertEquals("Unable to energise equipment end", exception.getMessage()); } @Override diff --git a/src/test/java/org/gridsuite/modification/modifications/OperatingStatusModificationLockoutLineTest.java b/src/test/java/org/gridsuite/modification/modifications/OperatingStatusModificationLockoutLineTest.java index 13eb4a60..db9b4aa3 100644 --- a/src/test/java/org/gridsuite/modification/modifications/OperatingStatusModificationLockoutLineTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/OperatingStatusModificationLockoutLineTest.java @@ -137,7 +137,7 @@ protected void checkModification() { OperatingStatusModificationInfos modificationInfos = (OperatingStatusModificationInfos) buildModification(); modificationInfos.setEquipmentId("notFound"); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> modificationInfos.toModification().check(getNetwork())); - assertEquals("EQUIPMENT_NOT_FOUND : notFound", exception.getMessage()); + assertEquals("Equipment not found: notFound", exception.getMessage()); } @Override diff --git a/src/test/java/org/gridsuite/modification/modifications/OperatingStatusModificationTripLineTest.java b/src/test/java/org/gridsuite/modification/modifications/OperatingStatusModificationTripLineTest.java index b589c8d5..d0334469 100644 --- a/src/test/java/org/gridsuite/modification/modifications/OperatingStatusModificationTripLineTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/OperatingStatusModificationTripLineTest.java @@ -72,7 +72,7 @@ protected void checkModification() { OperatingStatusModificationInfos modification = (OperatingStatusModificationInfos) buildModification(); modification.setEquipmentId("NotFoundEquipmentId"); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> modification.toModification().check(getNetwork())); - assertEquals("EQUIPMENT_NOT_FOUND : NotFoundEquipmentId", exception.getMessage()); + assertEquals("Equipment not found: NotFoundEquipmentId", exception.getMessage()); } @Test diff --git a/src/test/java/org/gridsuite/modification/modifications/ShuntCompensatorCreationInBusBreakerTest.java b/src/test/java/org/gridsuite/modification/modifications/ShuntCompensatorCreationInBusBreakerTest.java index e7d46223..466f796a 100644 --- a/src/test/java/org/gridsuite/modification/modifications/ShuntCompensatorCreationInBusBreakerTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/ShuntCompensatorCreationInBusBreakerTest.java @@ -34,7 +34,7 @@ protected void checkModification() { ShuntCompensatorCreationInfos shunt = (ShuntCompensatorCreationInfos) buildModification(); shunt.setBusOrBusbarSectionId("notFoundBus"); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> shunt.toModification().check(getNetwork())); - assertEquals("BUS_NOT_FOUND : notFoundBus", exception.getMessage()); + assertEquals("Bus notFoundBus does not exist in network", exception.getMessage()); } @Override diff --git a/src/test/java/org/gridsuite/modification/modifications/ShuntCompensatorCreationInNodeBreakerTest.java b/src/test/java/org/gridsuite/modification/modifications/ShuntCompensatorCreationInNodeBreakerTest.java index 679cbac4..bb258894 100644 --- a/src/test/java/org/gridsuite/modification/modifications/ShuntCompensatorCreationInNodeBreakerTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/ShuntCompensatorCreationInNodeBreakerTest.java @@ -66,19 +66,19 @@ protected void checkModification() { modificationToCreate.setEquipmentId("v5shunt"); assertNotNull(getNetwork().getShuntCompensator("v5shunt")); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> modificationToCreate.toModification().check(getNetwork())); - assertEquals("SHUNT_COMPENSATOR_ALREADY_EXISTS : v5shunt", exception.getMessage()); + assertEquals("Shunt compensator already exists: v5shunt", exception.getMessage()); // CreateWithMaximumSectionCountError modificationToCreate.setEquipmentId("newShunt"); modificationToCreate.setMaximumSectionCount(0); exception = assertThrows(NetworkModificationException.class, () -> modificationToCreate.toModification().check(getNetwork())); - assertEquals("CREATE_SHUNT_COMPENSATOR_ERROR : Maximum section count should be greater or equal to 1", exception.getMessage()); + assertEquals("Maximum section count should be greater or equal to 1", exception.getMessage()); // CreateWithSectionError modificationToCreate.setMaximumSectionCount(2); modificationToCreate.setSectionCount(3); exception = assertThrows(NetworkModificationException.class, () -> modificationToCreate.toModification().check(getNetwork())); - assertEquals("CREATE_SHUNT_COMPENSATOR_ERROR : Section count should be between 0 and Maximum section count (2), actual : 3", exception.getMessage()); + assertEquals("Section count should be between 0 and Maximum section count (2), actual : 3", exception.getMessage()); } @Override diff --git a/src/test/java/org/gridsuite/modification/modifications/ShuntCompensatorModificationTest.java b/src/test/java/org/gridsuite/modification/modifications/ShuntCompensatorModificationTest.java index d078000c..6b37af6c 100644 --- a/src/test/java/org/gridsuite/modification/modifications/ShuntCompensatorModificationTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/ShuntCompensatorModificationTest.java @@ -45,7 +45,7 @@ protected void checkModification() { .build(); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> shuntCompensator.toModification().check(getNetwork())); - assertEquals("SHUNT_COMPENSATOR_NOT_FOUND : Shunt compensator wrong id does not exist in network", exception.getMessage()); + assertEquals("Shunt compensator wrong id does not exist in network", exception.getMessage()); // WrongMaximumSectionCount var shuntCompensator1 = ShuntCompensatorModificationInfos.builder() @@ -54,7 +54,7 @@ protected void checkModification() { .maximumSectionCount(new AttributeModification<>(-1, OperationType.SET)) .build(); exception = assertThrows(NetworkModificationException.class, () -> shuntCompensator1.toModification().check(getNetwork())); - assertEquals("MODIFY_SHUNT_COMPENSATOR_ERROR : Maximum section count should be greater or equal to 1", exception.getMessage()); + assertEquals("Unable to modify shunt compensator: Maximum section count should be greater or equal to 1", exception.getMessage()); // testWrongSectionCount var shuntCompensator2 = ShuntCompensatorModificationInfos.builder() @@ -64,7 +64,7 @@ protected void checkModification() { .build(); exception = assertThrows(NetworkModificationException.class, () -> shuntCompensator2.toModification().check(getNetwork())); - assertEquals("MODIFY_SHUNT_COMPENSATOR_ERROR : Section count should be between 0 and Maximum section count (1), actual : 3", exception.getMessage()); + assertEquals("Unable to modify shunt compensator: Section count should be between 0 and Maximum section count (1), actual : 3", exception.getMessage()); // WrongSectionCountChangeSectionCount VoltageLevel v5 = getNetwork().getVoltageLevel("v5"); @@ -80,7 +80,7 @@ protected void checkModification() { .build(); exception = assertThrows(NetworkModificationException.class, () -> shuntCompensatorModifications.toModification().check(getNetwork())); - assertEquals("MODIFY_SHUNT_COMPENSATOR_ERROR : Section count should be between 0 and Maximum section count (1), actual : 3", exception.getMessage()); + assertEquals("Unable to modify shunt compensator: Section count should be between 0 and Maximum section count (1), actual : 3", exception.getMessage()); // WrongSectionCountChangeMaximumSectionCount var shuntCompensator4 = getNetwork().getShuntCompensator("v7shunt"); @@ -92,7 +92,7 @@ protected void checkModification() { .sectionCount(new AttributeModification<>(-1, OperationType.SET)) .build(); exception = assertThrows(NetworkModificationException.class, () -> shuntCompensatorModifications1.toModification().check(getNetwork())); - assertEquals("MODIFY_SHUNT_COMPENSATOR_ERROR : Section count should be between 0 and Maximum section count (1), actual : -1", exception.getMessage()); + assertEquals("Unable to modify shunt compensator: Section count should be between 0 and Maximum section count (1), actual : -1", exception.getMessage()); // NegativeQmaxAtNominalV var shuntCompensator5 = ShuntCompensatorModificationInfos.builder() @@ -101,7 +101,7 @@ protected void checkModification() { .maxQAtNominalV(new AttributeModification<>(-15.0, OperationType.SET)) .build(); exception = assertThrows(NetworkModificationException.class, () -> shuntCompensator5.toModification().apply(getNetwork())); - assertEquals("MODIFY_SHUNT_COMPENSATOR_ERROR : Qmax at nominal voltage should be greater or equal to 0", exception.getMessage()); + assertEquals("Unable to modify shunt compensator: Qmax at nominal voltage should be greater or equal to 0", exception.getMessage()); } @Test diff --git a/src/test/java/org/gridsuite/modification/modifications/StaticVarCompensatorCreationInBusBreakerTest.java b/src/test/java/org/gridsuite/modification/modifications/StaticVarCompensatorCreationInBusBreakerTest.java index 1c615e62..cc818912 100644 --- a/src/test/java/org/gridsuite/modification/modifications/StaticVarCompensatorCreationInBusBreakerTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/StaticVarCompensatorCreationInBusBreakerTest.java @@ -80,7 +80,7 @@ protected void checkModification() { StaticVarCompensatorCreationInfos staticVarCompensatorCreationInfos = (StaticVarCompensatorCreationInfos) buildModification(); staticVarCompensatorCreationInfos.setBusOrBusbarSectionId("notFoundBus"); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> staticVarCompensatorCreationInfos.toModification().check(getNetwork())); - assertEquals("BUS_NOT_FOUND : notFoundBus", exception.getMessage()); + assertEquals("Bus notFoundBus does not exist in network", exception.getMessage()); // CreateWithRegulatedTerminalError StaticVarCompensatorCreationInfos staticVarCompensatorCreationInfos1 = (StaticVarCompensatorCreationInfos) buildModification(); @@ -89,7 +89,7 @@ protected void checkModification() { staticVarCompensatorCreationInfos1.setRegulatingTerminalId("test"); staticVarCompensatorCreationInfos1.setRegulatingTerminalType("STATIC_VAR_COMPENSATOR"); exception = assertThrows(NetworkModificationException.class, () -> staticVarCompensatorCreationInfos1.toModification().check(getNetwork())); - assertEquals("EQUIPMENT_NOT_FOUND : Equipment with id=test not found with type STATIC_VAR_COMPENSATOR", exception.getMessage()); + assertEquals("Equipment with id=test not found with type STATIC_VAR_COMPENSATOR", exception.getMessage()); } @Override diff --git a/src/test/java/org/gridsuite/modification/modifications/StaticVarCompensatorCreationInNodeBreakerTest.java b/src/test/java/org/gridsuite/modification/modifications/StaticVarCompensatorCreationInNodeBreakerTest.java index 4aa1e02b..fb26b4ee 100644 --- a/src/test/java/org/gridsuite/modification/modifications/StaticVarCompensatorCreationInNodeBreakerTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/StaticVarCompensatorCreationInNodeBreakerTest.java @@ -24,7 +24,6 @@ import java.util.Map; import java.util.UUID; -import static org.gridsuite.modification.NetworkModificationException.Type.*; import static org.gridsuite.modification.utils.TestUtils.assertLogMessage; import static org.junit.jupiter.api.Assertions.*; @@ -80,24 +79,21 @@ protected void checkModification() { compensatorCreationInfos.setEquipmentId("v5Compensator"); StaticVarCompensatorCreation staticVarCompensatorCreation = (StaticVarCompensatorCreation) compensatorCreationInfos.toModification(); Exception exception = assertThrows(NetworkModificationException.class, () -> staticVarCompensatorCreation.check(network)); - assertEquals(new NetworkModificationException(STATIC_VAR_COMPENSATOR_ALREADY_EXISTS, "v5Compensator").getMessage(), - exception.getMessage()); + assertEquals("static var compensator already exists: v5Compensator", exception.getMessage()); // not found voltage level compensatorCreationInfos.setEquipmentId("idStaticVarCompensator2"); compensatorCreationInfos.setVoltageLevelId("notFoundVoltageLevelId"); StaticVarCompensatorCreation staticVarCompensatorCreation1 = (StaticVarCompensatorCreation) compensatorCreationInfos.toModification(); exception = assertThrows(NetworkModificationException.class, () -> staticVarCompensatorCreation1.check(network)); - assertEquals(new NetworkModificationException(VOLTAGE_LEVEL_NOT_FOUND, "notFoundVoltageLevelId").getMessage(), - exception.getMessage()); + assertEquals("Voltage level notFoundVoltageLevelId does not exist in network", exception.getMessage()); // not found busbar section compensatorCreationInfos.setVoltageLevelId("v2"); compensatorCreationInfos.setBusOrBusbarSectionId("notFoundBusbarSection"); StaticVarCompensatorCreation staticVarCompensatorCreation2 = (StaticVarCompensatorCreation) compensatorCreationInfos.toModification(); exception = assertThrows(NetworkModificationException.class, () -> staticVarCompensatorCreation2.check(network)); - assertEquals(new NetworkModificationException(BUSBAR_SECTION_NOT_FOUND, "notFoundBusbarSection").getMessage(), - exception.getMessage()); + assertEquals("Busbar section notFoundBusbarSection does not exist in network", exception.getMessage()); // invalid min susceptance compensatorCreationInfos.setVoltageLevelId("v2"); @@ -107,7 +103,7 @@ protected void checkModification() { StaticVarCompensatorCreation staticVarCompensatorCreation3 = (StaticVarCompensatorCreation) compensatorCreationInfos.toModification(); exception = assertThrows(NetworkModificationException.class, () -> staticVarCompensatorCreation3.check(network)); - assertEquals("CREATE_STATIC_VAR_COMPENSATOR_ERROR : StaticVarCompensator 'idStaticVarCompensator2' : minimum susceptance is not set", + assertEquals("StaticVarCompensator 'idStaticVarCompensator2' : minimum susceptance is not set", exception.getMessage()); compensatorCreationInfos.setMinSusceptance(200.0); compensatorCreationInfos.setMaxSusceptance(null); @@ -115,8 +111,7 @@ protected void checkModification() { compensatorCreationInfos.setMinQAtNominalV(null); StaticVarCompensatorCreation staticVarCompensatorCreation4 = (StaticVarCompensatorCreation) compensatorCreationInfos.toModification(); exception = assertThrows(NetworkModificationException.class, () -> staticVarCompensatorCreation4.check(network)); - assertEquals("CREATE_STATIC_VAR_COMPENSATOR_ERROR : " + - "StaticVarCompensator 'idStaticVarCompensator2' : maximum susceptance is not set", + assertEquals("StaticVarCompensator 'idStaticVarCompensator2' : maximum susceptance is not set", exception.getMessage()); compensatorCreationInfos.setMaxSusceptance(100.0); @@ -125,8 +120,7 @@ protected void checkModification() { compensatorCreationInfos.setReactivePowerSetpoint(null); StaticVarCompensatorCreation staticVarCompensatorCreation5 = (StaticVarCompensatorCreation) compensatorCreationInfos.toModification(); exception = assertThrows(NetworkModificationException.class, () -> staticVarCompensatorCreation5.check(network)); - assertEquals("CREATE_STATIC_VAR_COMPENSATOR_ERROR : " + - "StaticVarCompensator 'idStaticVarCompensator2' : maximum susceptance is expected to be greater than or equal to minimum susceptance", + assertEquals("StaticVarCompensator 'idStaticVarCompensator2' : maximum susceptance is expected to be greater than or equal to minimum susceptance", exception.getMessage()); compensatorCreationInfos.setMaxSusceptance(null); compensatorCreationInfos.setMinSusceptance(null); @@ -134,8 +128,7 @@ protected void checkModification() { compensatorCreationInfos.setMinQAtNominalV(300.0); StaticVarCompensatorCreation staticVarCompensatorCreation6 = (StaticVarCompensatorCreation) compensatorCreationInfos.toModification(); exception = assertThrows(NetworkModificationException.class, () -> staticVarCompensatorCreation6.check(network)); - assertEquals("CREATE_STATIC_VAR_COMPENSATOR_ERROR : " + - "StaticVarCompensator 'idStaticVarCompensator2' : maximum Q at nominal voltage is expected to be greater than or equal to minimum Q", + assertEquals("StaticVarCompensator 'idStaticVarCompensator2' : maximum Q at nominal voltage is expected to be greater than or equal to minimum Q", exception.getMessage()); compensatorCreationInfos.setMaxQAtNominalV(200.0); compensatorCreationInfos.setMinQAtNominalV(100.0); @@ -143,16 +136,14 @@ protected void checkModification() { compensatorCreationInfos.setReactivePowerSetpoint(null); StaticVarCompensatorCreation staticVarCompensatorCreation7 = (StaticVarCompensatorCreation) compensatorCreationInfos.toModification(); exception = assertThrows(NetworkModificationException.class, () -> staticVarCompensatorCreation7.check(network)); - assertEquals("CREATE_STATIC_VAR_COMPENSATOR_ERROR : " + - "StaticVarCompensator 'idStaticVarCompensator2' : Reactive power setpoint is not set", + assertEquals("StaticVarCompensator 'idStaticVarCompensator2' : Reactive power setpoint is not set", exception.getMessage()); compensatorCreationInfos.setRegulationMode(StaticVarCompensator.RegulationMode.VOLTAGE); compensatorCreationInfos.setVoltageSetpoint(null); StaticVarCompensatorCreation staticVarCompensatorCreation8 = (StaticVarCompensatorCreation) compensatorCreationInfos.toModification(); exception = assertThrows(NetworkModificationException.class, () -> staticVarCompensatorCreation8.check(network)); - assertEquals("CREATE_STATIC_VAR_COMPENSATOR_ERROR : " + - "StaticVarCompensator 'idStaticVarCompensator2' : Voltage setpoint is not set", + assertEquals("StaticVarCompensator 'idStaticVarCompensator2' : Voltage setpoint is not set", exception.getMessage()); //CreateWithStandbyAutomatonErrors StaticVarCompensatorCreationInfos compensatorCreationInfos1 = (StaticVarCompensatorCreationInfos) buildModification(); @@ -187,8 +178,7 @@ protected void checkModification() { StaticVarCompensatorCreation staticVarCompensatorCreation9 = (StaticVarCompensatorCreation) compensatorCreationInfos2.toModification(); exception = assertThrows(NetworkModificationException.class, () -> staticVarCompensatorCreation9.check(network)); - assertEquals("CREATE_STATIC_VAR_COMPENSATOR_ERROR : " + - "StaticVarCompensator 'idStaticVarCompensator2' : q0 must be within the range of minimum Q and maximum Q", + assertEquals("StaticVarCompensator 'idStaticVarCompensator2' : q0 must be within the range of minimum Q and maximum Q", exception.getMessage()); compensatorCreationInfos2.setMinQAtNominalV(null); compensatorCreationInfos2.setMaxQAtNominalV(null); @@ -198,8 +188,7 @@ protected void checkModification() { compensatorCreationInfos2.setQ0(null); StaticVarCompensatorCreation staticVarCompensatorCreation10 = (StaticVarCompensatorCreation) compensatorCreationInfos2.toModification(); exception = assertThrows(NetworkModificationException.class, () -> staticVarCompensatorCreation10.check(network)); - assertEquals("CREATE_STATIC_VAR_COMPENSATOR_ERROR : " + - "StaticVarCompensator 'idStaticVarCompensator2' : b0 must be within the range of minimum susceptance and maximum susceptance", + assertEquals("StaticVarCompensator 'idStaticVarCompensator2' : b0 must be within the range of minimum susceptance and maximum susceptance", exception.getMessage()); compensatorCreationInfos2.setB0(250.0); compensatorCreationInfos2.setRegulating(false); @@ -208,8 +197,7 @@ protected void checkModification() { StaticVarCompensatorCreation staticVarCompensatorCreation11 = (StaticVarCompensatorCreation) compensatorCreationInfos2.toModification(); exception = assertThrows(NetworkModificationException.class, () -> staticVarCompensatorCreation11.check(network)); - assertEquals("CREATE_STATIC_VAR_COMPENSATOR_ERROR : " + - "StaticVarCompensator 'idStaticVarCompensator2' : Standby is only supported in Voltage Regulation mode", + assertEquals("StaticVarCompensator 'idStaticVarCompensator2' : Standby is only supported in Voltage Regulation mode", exception.getMessage()); } @@ -240,7 +228,7 @@ void testCreationInfoChecks() { StaticVarCompensatorCreation staticVarCompensatorCreation = (StaticVarCompensatorCreation) staticVarCompensatorCreationInfos.toModification(); String message = assertThrows(NetworkModificationException.class, () -> staticVarCompensatorCreation.check(network)).getMessage(); - assertEquals("CREATE_STATIC_VAR_COMPENSATOR_ERROR : Static var compensator 'svc3' : can not have a negative value for voltage set point", message); + assertEquals("Static var compensator 'svc3' : can not have a negative value for voltage set point", message); StaticVarCompensatorCreationInfos staticVarCompensatorModificationInfos2 = StaticVarCompensatorCreationInfos.builder() .equipmentId("svc3") @@ -258,7 +246,7 @@ void testCreationInfoChecks() { StaticVarCompensatorCreation staticVarCompensatorCreation2 = (StaticVarCompensatorCreation) staticVarCompensatorModificationInfos2.toModification(); message = assertThrows(NetworkModificationException.class, () -> staticVarCompensatorCreation2.check(network)).getMessage(); - assertEquals("CREATE_STATIC_VAR_COMPENSATOR_ERROR : Static var compensator 'svc3' : can not have a negative value for high voltage set point", message); + assertEquals("Static var compensator 'svc3' : can not have a negative value for high voltage set point", message); StaticVarCompensatorCreationInfos staticVarCompensatorModificationInfos3 = StaticVarCompensatorCreationInfos.builder() .equipmentId("svc3") @@ -276,7 +264,7 @@ void testCreationInfoChecks() { StaticVarCompensatorCreation staticVarCompensatorCreation3 = (StaticVarCompensatorCreation) staticVarCompensatorModificationInfos3.toModification(); message = assertThrows(NetworkModificationException.class, () -> staticVarCompensatorCreation3.check(network)).getMessage(); - assertEquals("CREATE_STATIC_VAR_COMPENSATOR_ERROR : Static var compensator 'svc3' : can not have a negative value for low voltage set point", message); + assertEquals("Static var compensator 'svc3' : can not have a negative value for low voltage set point", message); StaticVarCompensatorCreationInfos staticVarCompensatorModificationInfos4 = StaticVarCompensatorCreationInfos.builder() .equipmentId("svc3") @@ -294,7 +282,7 @@ void testCreationInfoChecks() { StaticVarCompensatorCreation staticVarCompensatorCreation4 = (StaticVarCompensatorCreation) staticVarCompensatorModificationInfos4.toModification(); message = assertThrows(NetworkModificationException.class, () -> staticVarCompensatorCreation4.check(network)).getMessage(); - assertEquals("CREATE_STATIC_VAR_COMPENSATOR_ERROR : Static var compensator 'svc3' : can not have a negative value for high voltage threshold", message); + assertEquals("Static var compensator 'svc3' : can not have a negative value for high voltage threshold", message); StaticVarCompensatorCreationInfos staticVarCompensatorModificationInfos5 = StaticVarCompensatorCreationInfos.builder() .equipmentId("svc3") @@ -312,6 +300,6 @@ void testCreationInfoChecks() { StaticVarCompensatorCreation staticVarCompensatorCreation5 = (StaticVarCompensatorCreation) staticVarCompensatorModificationInfos5.toModification(); message = assertThrows(NetworkModificationException.class, () -> staticVarCompensatorCreation5.check(network)).getMessage(); - assertEquals("CREATE_STATIC_VAR_COMPENSATOR_ERROR : Static var compensator 'svc3' : can not have a negative value for low voltage threshold", message); + assertEquals("Static var compensator 'svc3' : can not have a negative value for low voltage threshold", message); } } diff --git a/src/test/java/org/gridsuite/modification/modifications/SubstationModificationTest.java b/src/test/java/org/gridsuite/modification/modifications/SubstationModificationTest.java index 7f2ec927..36ec2be9 100644 --- a/src/test/java/org/gridsuite/modification/modifications/SubstationModificationTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/SubstationModificationTest.java @@ -69,7 +69,7 @@ protected void checkModification() { .country(new AttributeModification<>(Country.JP, OperationType.SET)) .build(); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> infos.toModification().check(getNetwork())); - assertEquals("SUBSTATION_NOT_FOUND : Substation unknown does not exist in network", exception.getMessage()); + assertEquals("Substation unknown does not exist in network", exception.getMessage()); } @Override diff --git a/src/test/java/org/gridsuite/modification/modifications/TwoWindingsTransformerCreationBusBreakerTest.java b/src/test/java/org/gridsuite/modification/modifications/TwoWindingsTransformerCreationBusBreakerTest.java index a5cf4247..c23f5a87 100644 --- a/src/test/java/org/gridsuite/modification/modifications/TwoWindingsTransformerCreationBusBreakerTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/TwoWindingsTransformerCreationBusBreakerTest.java @@ -12,13 +12,13 @@ import com.powsybl.iidm.network.PhaseTapChanger; import com.powsybl.iidm.network.extensions.ConnectablePosition; import org.gridsuite.modification.dto.*; +import org.gridsuite.modification.NetworkModificationException; import org.gridsuite.modification.utils.NetworkCreation; import org.junit.jupiter.api.Test; import java.util.List; import java.util.Map; import java.util.UUID; -import static org.gridsuite.modification.NetworkModificationException.Type.BUS_NOT_FOUND; import static org.gridsuite.modification.dto.OperationalLimitsGroupInfos.*; import static org.junit.jupiter.api.Assertions.*; @@ -173,8 +173,8 @@ protected void checkModification() { assertEquals("Invalid id ''", exception.getMessage()); twoWindingsTransformerCreationInfos.setBusOrBusbarSectionId1("notFoundBus"); - exception = assertThrows(PowsyblException.class, () -> twoWindingsTransformerCreationInfos.toModification().check(getNetwork())); - assertEquals(BUS_NOT_FOUND + " : notFoundBus", exception.getMessage()); + exception = assertThrows(NetworkModificationException.class, () -> twoWindingsTransformerCreationInfos.toModification().check(getNetwork())); + assertEquals("Bus notFoundBus does not exist in network", exception.getMessage()); } @Override diff --git a/src/test/java/org/gridsuite/modification/modifications/TwoWindingsTransformerCreationNodeBreakerTest.java b/src/test/java/org/gridsuite/modification/modifications/TwoWindingsTransformerCreationNodeBreakerTest.java index 2b85fc26..23d40ed4 100644 --- a/src/test/java/org/gridsuite/modification/modifications/TwoWindingsTransformerCreationNodeBreakerTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/TwoWindingsTransformerCreationNodeBreakerTest.java @@ -408,7 +408,7 @@ protected void checkModification() { TwoWindingsTransformerCreationInfos twoWindingsTransformerCreationInfos = (TwoWindingsTransformerCreationInfos) buildModification(); twoWindingsTransformerCreationInfos.setEquipmentId("trf1"); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> twoWindingsTransformerCreationInfos.toModification().check(getNetwork())); - assertEquals("TWO_WINDINGS_TRANSFORMER_ALREADY_EXISTS : trf1", exception.getMessage()); + assertEquals("Two winding transformer already exists: trf1", exception.getMessage()); } private void testCreateTwoWindingsTransformerInNodeBreaker(TwoWindingsTransformerCreationInfos twoWindingsTransformerCreationInfos) { @@ -465,7 +465,7 @@ void testCreationInfoChecks() { TwoWindingsTransformerCreation twoWindingsTransformerCreation = (TwoWindingsTransformerCreation) twoWindingsTransformerCreationInfos.toModification(); String message = assertThrows(NetworkModificationException.class, () -> twoWindingsTransformerCreation.check(network)).getMessage(); - assertEquals("CREATE_TWO_WINDINGS_TRANSFORMER_ERROR : Two windings transformer 'twt3' : can not have a negative value for Resistance R", message); + assertEquals("Two windings transformer 'twt3' : can not have a negative value for Resistance R", message); TwoWindingsTransformerCreationInfos twoWindingsTransformerCreationInfos2 = TwoWindingsTransformerCreationInfos.builder() .equipmentId("twt3") @@ -478,7 +478,7 @@ void testCreationInfoChecks() { TwoWindingsTransformerCreation twoWindingsTransformerCreation2 = (TwoWindingsTransformerCreation) twoWindingsTransformerCreationInfos2.toModification(); message = assertThrows(NetworkModificationException.class, () -> twoWindingsTransformerCreation2.check(network)).getMessage(); - assertEquals("CREATE_TWO_WINDINGS_TRANSFORMER_ERROR : Two windings transformer 'twt3' : can not have a negative value for Conductance G", message); + assertEquals("Two windings transformer 'twt3' : can not have a negative value for Conductance G", message); TwoWindingsTransformerCreationInfos twoWindingsTransformerCreationInfos3 = TwoWindingsTransformerCreationInfos.builder() .equipmentId("twt3") @@ -491,7 +491,7 @@ void testCreationInfoChecks() { TwoWindingsTransformerCreation twoWindingsTransformerCreation3 = (TwoWindingsTransformerCreation) twoWindingsTransformerCreationInfos3.toModification(); message = assertThrows(NetworkModificationException.class, () -> twoWindingsTransformerCreation3.check(network)).getMessage(); - assertEquals("CREATE_TWO_WINDINGS_TRANSFORMER_ERROR : Two windings transformer 'twt3' : can not have a negative value for Rated Voltage on side 1", message); + assertEquals("Two windings transformer 'twt3' : can not have a negative value for Rated Voltage on side 1", message); TwoWindingsTransformerCreationInfos twoWindingsTransformerCreationInfos4 = TwoWindingsTransformerCreationInfos.builder() .equipmentId("twt3") @@ -504,7 +504,7 @@ void testCreationInfoChecks() { TwoWindingsTransformerCreation twoWindingsTransformerCreation4 = (TwoWindingsTransformerCreation) twoWindingsTransformerCreationInfos4.toModification(); message = assertThrows(NetworkModificationException.class, () -> twoWindingsTransformerCreation4.check(network)).getMessage(); - assertEquals("CREATE_TWO_WINDINGS_TRANSFORMER_ERROR : Two windings transformer 'twt3' : can not have a negative value for Rated Voltage on side 2", message); + assertEquals("Two windings transformer 'twt3' : can not have a negative value for Rated Voltage on side 2", message); TwoWindingsTransformerCreationInfos twoWindingsTransformerCreationInfos5 = TwoWindingsTransformerCreationInfos.builder() .equipmentId("twt3") @@ -519,7 +519,7 @@ void testCreationInfoChecks() { TwoWindingsTransformerCreation twoWindingsTransformerCreation5 = (TwoWindingsTransformerCreation) twoWindingsTransformerCreationInfos5.toModification(); message = assertThrows(NetworkModificationException.class, () -> twoWindingsTransformerCreation5.check(network)).getMessage(); - assertEquals("CREATE_TWO_WINDINGS_TRANSFORMER_ERROR : Two windings transformer 'twt3' : can not have a negative value for Target voltage for ratio tap changer", message); + assertEquals("Two windings transformer 'twt3' : can not have a negative value for Target voltage for ratio tap changer", message); TwoWindingsTransformerCreationInfos twoWindingsTransformerCreationInfos6 = TwoWindingsTransformerCreationInfos.builder() .equipmentId("twt3") @@ -532,7 +532,7 @@ void testCreationInfoChecks() { TwoWindingsTransformerCreation twoWindingsTransformerCreation6 = (TwoWindingsTransformerCreation) twoWindingsTransformerCreationInfos6.toModification(); message = assertThrows(NetworkModificationException.class, () -> twoWindingsTransformerCreation6.check(network)).getMessage(); - assertEquals("CREATE_TWO_WINDINGS_TRANSFORMER_ERROR : Two windings transformer 'twt3' : can not have a negative value for Rated nominal power", message); + assertEquals("Two windings transformer 'twt3' : can not have a negative value for Rated nominal power", message); } } diff --git a/src/test/java/org/gridsuite/modification/modifications/TwoWindingsTransformerModificationTest.java b/src/test/java/org/gridsuite/modification/modifications/TwoWindingsTransformerModificationTest.java index 78f4223b..c8b5f865 100644 --- a/src/test/java/org/gridsuite/modification/modifications/TwoWindingsTransformerModificationTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/TwoWindingsTransformerModificationTest.java @@ -218,7 +218,7 @@ protected void checkModification() { twoWindingsTransformerModificationInfos.setEquipmentId("2wt_not_existing"); TwoWindingsTransformerModification twoWindingsTransformerModification = (TwoWindingsTransformerModification) twoWindingsTransformerModificationInfos.toModification(); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> twoWindingsTransformerModification.check(network)); - assertEquals("TWO_WINDINGS_TRANSFORMER_NOT_FOUND : Two windings transformer '2wt_not_existing' : it does not exist in the network", exception.getMessage()); + assertEquals("Two windings transformer '2wt_not_existing' : it does not exist in the network", exception.getMessage()); // no phase tap changer on this transformer // ratio tap changer check regulating terminal @@ -228,7 +228,7 @@ protected void checkModification() { TwoWindingsTransformerModification twoWindingsTransformerModification2 = (TwoWindingsTransformerModification) twtModificationInfos2.toModification(); NetworkModificationException exception2 = assertThrows(NetworkModificationException.class, () -> twoWindingsTransformerModification2.check(network)); - assertEquals("MODIFY_TWO_WINDINGS_TRANSFORMER_ERROR : Two windings transformer 'trf1' : Regulation is set to Distant but regulating terminal information are incomplete", + assertEquals("Two windings transformer 'trf1' : Regulation is set to Distant but regulating terminal information are incomplete", exception2.getMessage()); // ratio tap changer check regulating terminal @@ -238,7 +238,7 @@ protected void checkModification() { TwoWindingsTransformerModification twoWindingsTransformerModification4 = (TwoWindingsTransformerModification) twtModificationInfos4.toModification(); NetworkModificationException exception4 = assertThrows(NetworkModificationException.class, () -> twoWindingsTransformerModification4.check(network)); - assertEquals("EQUIPMENT_NOT_FOUND : Equipment with id=test not found with type TWO_WINDINGS_TRANSFORMER", exception4.getMessage()); + assertEquals("Equipment with id=test not found with type TWO_WINDINGS_TRANSFORMER", exception4.getMessage()); // ratio tap changer check regulating terminal TwoWindingsTransformerModificationInfos twtModificationInfos5 = (TwoWindingsTransformerModificationInfos) buildModification(); @@ -247,7 +247,7 @@ protected void checkModification() { TwoWindingsTransformerModification twoWindingsTransformerModification5 = (TwoWindingsTransformerModification) twtModificationInfos5.toModification(); NetworkModificationException exception5 = assertThrows(NetworkModificationException.class, () -> twoWindingsTransformerModification5.check(network)); - assertEquals("VOLTAGE_LEVEL_NOT_FOUND : Voltage level with id=test not found", exception5.getMessage()); + assertEquals("Voltage level with id=test not found", exception5.getMessage()); // do not throw TwoWindingsTransformerModificationInfos twtModificationInfos6 = (TwoWindingsTransformerModificationInfos) buildModification(); @@ -270,7 +270,7 @@ protected void checkModification() { TwoWindingsTransformerModification twoWindingsTransformerModification6 = (TwoWindingsTransformerModification) twoWindingsTransformerModificationInfos1.toModification(); String message = assertThrows(NetworkModificationException.class, () -> twoWindingsTransformerModification6.check(network)).getMessage(); - assertEquals("MODIFY_TWO_WINDINGS_TRANSFORMER_ERROR : Two windings transformer 'trf1' : can not have a negative value for Resistance R", message); + assertEquals("Two windings transformer 'trf1' : can not have a negative value for Resistance R", message); TwoWindingsTransformerModificationInfos twoWindingsTransformerModificationInfos2 = TwoWindingsTransformerModificationInfos.builder() .equipmentId("trf1") @@ -279,7 +279,7 @@ protected void checkModification() { TwoWindingsTransformerModification twoWindingsTransformerModification7 = (TwoWindingsTransformerModification) twoWindingsTransformerModificationInfos2.toModification(); message = assertThrows(NetworkModificationException.class, () -> twoWindingsTransformerModification7.check(network)).getMessage(); - assertEquals("MODIFY_TWO_WINDINGS_TRANSFORMER_ERROR : Two windings transformer 'trf1' : can not have a negative value for Conductance G", message); + assertEquals("Two windings transformer 'trf1' : can not have a negative value for Conductance G", message); TwoWindingsTransformerModificationInfos twoWindingsTransformerModificationInfos3 = TwoWindingsTransformerModificationInfos.builder() .equipmentId("trf1") @@ -288,7 +288,7 @@ protected void checkModification() { TwoWindingsTransformerModification twoWindingsTransformerModification8 = (TwoWindingsTransformerModification) twoWindingsTransformerModificationInfos3.toModification(); message = assertThrows(NetworkModificationException.class, () -> twoWindingsTransformerModification8.check(network)).getMessage(); - assertEquals("MODIFY_TWO_WINDINGS_TRANSFORMER_ERROR : Two windings transformer 'trf1' : can not have a negative value for Rated Voltage on side 1", message); + assertEquals("Two windings transformer 'trf1' : can not have a negative value for Rated Voltage on side 1", message); TwoWindingsTransformerModificationInfos twoWindingsTransformerModificationInfos4 = TwoWindingsTransformerModificationInfos.builder() .equipmentId("trf1") @@ -296,7 +296,7 @@ protected void checkModification() { .build(); TwoWindingsTransformerModification twoWindingsTransformerModification9 = (TwoWindingsTransformerModification) twoWindingsTransformerModificationInfos4.toModification(); message = assertThrows(NetworkModificationException.class, () -> twoWindingsTransformerModification9.check(network)).getMessage(); - assertEquals("MODIFY_TWO_WINDINGS_TRANSFORMER_ERROR : Two windings transformer 'trf1' : can not have a negative value for Rated Voltage on side 2", message); + assertEquals("Two windings transformer 'trf1' : can not have a negative value for Rated Voltage on side 2", message); TwoWindingsTransformerModificationInfos twoWindingsTransformerModificationInfos5 = TwoWindingsTransformerModificationInfos.builder() .equipmentId("trf1") @@ -305,7 +305,7 @@ protected void checkModification() { .build(); TwoWindingsTransformerModification twoWindingsTransformerModification10 = (TwoWindingsTransformerModification) twoWindingsTransformerModificationInfos5.toModification(); message = assertThrows(NetworkModificationException.class, () -> twoWindingsTransformerModification10.check(network)).getMessage(); - assertEquals("MODIFY_TWO_WINDINGS_TRANSFORMER_ERROR : Two windings transformer 'trf1' : can not have a negative value for Target voltage for ratio tap changer", message); + assertEquals("Two windings transformer 'trf1' : can not have a negative value for Target voltage for ratio tap changer", message); TwoWindingsTransformerModificationInfos twoWindingsTransformerModificationInfos6 = TwoWindingsTransformerModificationInfos.builder() .equipmentId("trf1") @@ -313,7 +313,7 @@ protected void checkModification() { .build(); TwoWindingsTransformerModification twoWindingsTransformerModification11 = (TwoWindingsTransformerModification) twoWindingsTransformerModificationInfos6.toModification(); message = assertThrows(NetworkModificationException.class, () -> twoWindingsTransformerModification11.check(network)).getMessage(); - assertEquals("MODIFY_TWO_WINDINGS_TRANSFORMER_ERROR : Two windings transformer 'trf1' : can not have a negative value for Rated nominal power", message); + assertEquals("Two windings transformer 'trf1' : can not have a negative value for Rated nominal power", message); } private TwoWindingsTransformer createPhaseTapChanger() { @@ -468,7 +468,7 @@ void testPhaseTapChangerRegulationModification2() { Network network = getNetwork(); TwoWindingsTransformerModification twoWindingsTransformerModification = (TwoWindingsTransformerModification) phaseTapChangerCreation.toModification(); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> twoWindingsTransformerModification.apply(network)); - assertEquals("MODIFY_TWO_WINDINGS_TRANSFORMER_ERROR : Regulation value is missing when modifying, phase tap changer can not regulate", exception.getMessage()); + assertEquals("Two winding transformer modification error: Regulation value is missing when modifying, phase tap changer can not regulate", exception.getMessage()); // modification 2 : settings phaseTapChangerCreation.getPhaseTapChanger().setRegulationValue(new AttributeModification<>(10.0, OperationType.SET)); @@ -507,7 +507,7 @@ void testChangeConnectionStatus() { changeConnectionState(getNetwork().getTwoWindingsTransformer("trf2"), TwoSides.ONE, true, true, null); changeConnectionState(getNetwork().getTwoWindingsTransformer("trf2"), TwoSides.ONE, true, false, null); changeConnectionState(getNetwork().getTwoWindingsTransformer("trf2"), TwoSides.TWO, true, true, null); - changeConnectionState(getNetwork().getTwoWindingsTransformer("trf2"), TwoSides.TWO, true, false, "BRANCH_MODIFICATION_ERROR : Could not disconnect equipment 'trf2' on side 2"); + changeConnectionState(getNetwork().getTwoWindingsTransformer("trf2"), TwoSides.TWO, true, false, "Could not disconnect equipment 'trf2' on side 2"); } private void changeConnectionState(TwoWindingsTransformer existingEquipment, TwoSides side, boolean actualState, boolean expectedState, String errorMessage) { @@ -595,12 +595,12 @@ void testProcessPhaseTapChangerCreation() { AttributeModification regulatingModification = new AttributeModification<>(true, OperationType.SET); String message = assertThrows(NetworkModificationException.class, () -> processPhaseTapRegulation(null, adder, false, null, regulationValueModification, null, regulatingModification, regulationReports)).getMessage(); - assertEquals("CREATE_TWO_WINDINGS_TRANSFORMER_ERROR : Regulation mode is missing when creating tap phase changer with regulation enabled", message); + assertEquals("Two winding transformer creation error: Regulation mode is missing when creating tap phase changer with regulation enabled", message); AttributeModification regulationModeModification = new AttributeModification<>(PhaseTapChanger.RegulationMode.CURRENT_LIMITER, OperationType.SET); String message2 = assertThrows(NetworkModificationException.class, () -> processPhaseTapRegulation(null, adder, false, regulationModeModification, null, null, regulatingModification, regulationReports)).getMessage(); - assertEquals("CREATE_TWO_WINDINGS_TRANSFORMER_ERROR : Regulation value is missing when creating tap phase changer with regulation enabled", message2); + assertEquals("Two winding transformer creation error: Regulation value is missing when creating tap phase changer with regulation enabled", message2); processPhaseTapRegulation(null, adder, false, new AttributeModification<>(PhaseTapChanger.RegulationMode.CURRENT_LIMITER, OperationType.SET), null, null, null, regulationReports); diff --git a/src/test/java/org/gridsuite/modification/modifications/VoltageLevelCreationTest.java b/src/test/java/org/gridsuite/modification/modifications/VoltageLevelCreationTest.java index 991f45e8..f84e64ae 100644 --- a/src/test/java/org/gridsuite/modification/modifications/VoltageLevelCreationTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/VoltageLevelCreationTest.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.UUID; -import static org.gridsuite.modification.NetworkModificationException.Type.*; import static org.junit.jupiter.api.Assertions.*; /** @@ -65,54 +64,47 @@ protected void checkModification() { VoltageLevelCreation voltageLevelCreation = (VoltageLevelCreation) vli.toModification(); Exception exception = assertThrows(NetworkModificationException.class, () -> voltageLevelCreation.apply(network)); - assertEquals(new NetworkModificationException(SUBSTATION_NOT_FOUND, "absent_station").getMessage(), - exception.getMessage()); + assertEquals("Substation absent_station does not exist in network", exception.getMessage()); VoltageLevelCreationInfos vli1 = (VoltageLevelCreationInfos) buildModification(); vli1.getCouplingDevices().getFirst().setBusbarSectionId1("1.1"); vli1.getCouplingDevices().getFirst().setBusbarSectionId2("1.1"); VoltageLevelCreation voltageLevelCreation1 = (VoltageLevelCreation) vli1.toModification(); exception = assertThrows(NetworkModificationException.class, () -> voltageLevelCreation1.check(network)); - assertEquals(new NetworkModificationException(CREATE_VOLTAGE_LEVEL_ERROR, "Coupling between same bus bar section is not allowed").getMessage(), - exception.getMessage()); + assertEquals("Coupling between same bus bar section is not allowed", exception.getMessage()); VoltageLevelCreationInfos vli2 = (VoltageLevelCreationInfos) buildModification(); vli2.setIpMin(0.0); vli2.setIpMax(null); VoltageLevelCreation voltageLevelCreation2 = (VoltageLevelCreation) vli2.toModification(); exception = assertThrows(NetworkModificationException.class, () -> voltageLevelCreation2.check(network)); - assertEquals(new NetworkModificationException(CREATE_VOLTAGE_LEVEL_ERROR, "IpMax is required").getMessage(), - exception.getMessage()); + assertEquals("IpMax is required", exception.getMessage()); // try to create an existing VL VoltageLevelCreationInfos vli3 = (VoltageLevelCreationInfos) buildModification(); vli3.setEquipmentId("v1"); VoltageLevelCreation voltageLevelCreation3 = (VoltageLevelCreation) vli3.toModification(); exception = assertThrows(NetworkModificationException.class, () -> voltageLevelCreation3.check(network)); - assertEquals(new NetworkModificationException(VOLTAGE_LEVEL_ALREADY_EXISTS, "v1").getMessage(), - exception.getMessage()); + assertEquals("Voltage level v1 already exists", exception.getMessage()); // check values VoltageLevelCreationInfos vli4 = (VoltageLevelCreationInfos) buildModification(); vli4.setNominalV(-400); VoltageLevelCreation voltageLevelCreation4 = (VoltageLevelCreation) vli4.toModification(); exception = assertThrows(NetworkModificationException.class, () -> voltageLevelCreation4.check(network)); - assertEquals(new NetworkModificationException(CREATE_VOLTAGE_LEVEL_ERROR, "Voltage level 'vlId' : can not have a negative value for Nominal Voltage").getMessage(), - exception.getMessage()); + assertEquals("Voltage level 'vlId' : can not have a negative value for Nominal Voltage", exception.getMessage()); VoltageLevelCreationInfos vli5 = (VoltageLevelCreationInfos) buildModification(); vli5.setLowVoltageLimit(-100d); VoltageLevelCreation voltageLevelCreation5 = (VoltageLevelCreation) vli5.toModification(); exception = assertThrows(NetworkModificationException.class, () -> voltageLevelCreation5.check(network)); - assertEquals(new NetworkModificationException(CREATE_VOLTAGE_LEVEL_ERROR, "Voltage level 'vlId' : can not have a negative value for Low voltage limit").getMessage(), - exception.getMessage()); + assertEquals("Voltage level 'vlId' : can not have a negative value for Low voltage limit", exception.getMessage()); VoltageLevelCreationInfos vli6 = (VoltageLevelCreationInfos) buildModification(); vli6.setHighVoltageLimit(-50d); VoltageLevelCreation voltageLevelCreation6 = (VoltageLevelCreation) vli6.toModification(); exception = assertThrows(NetworkModificationException.class, () -> voltageLevelCreation6.check(network)); - assertEquals(new NetworkModificationException(CREATE_VOLTAGE_LEVEL_ERROR, "Voltage level 'vlId' : can not have a negative value for High voltage limit").getMessage(), - exception.getMessage()); + assertEquals("Voltage level 'vlId' : can not have a negative value for High voltage limit", exception.getMessage()); } @Test @@ -183,7 +175,7 @@ private void testIccWithError(Double ipMin, Double ipMax, String reportError) { NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> voltageLevelCreation.check(network)); // VL could not have been created assertNull(getNetwork().getVoltageLevel("vl_ko")); - assertEquals(new NetworkModificationException(CREATE_VOLTAGE_LEVEL_ERROR, reportError).getMessage(), exception.getMessage()); + assertEquals(new NetworkModificationException(reportError).getMessage(), exception.getMessage()); } @Test diff --git a/src/test/java/org/gridsuite/modification/modifications/VoltageLevelModificationTest.java b/src/test/java/org/gridsuite/modification/modifications/VoltageLevelModificationTest.java index c3098712..edf4c079 100644 --- a/src/test/java/org/gridsuite/modification/modifications/VoltageLevelModificationTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/VoltageLevelModificationTest.java @@ -20,7 +20,6 @@ import java.util.Map; import java.util.UUID; -import static org.gridsuite.modification.NetworkModificationException.Type.MODIFY_VOLTAGE_LEVEL_ERROR; import static org.junit.jupiter.api.Assertions.*; /** @@ -111,7 +110,7 @@ private void testIpMinIpMaxNotChanged(Double ipMin, Double ipMax, String reportE Network network = getNetwork(); VoltageLevelModification voltageLevelModification = (VoltageLevelModification) vli.toModification(); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> voltageLevelModification.check(network)); - assertEquals(new NetworkModificationException(MODIFY_VOLTAGE_LEVEL_ERROR, reportError).getMessage(), exception.getMessage()); + assertEquals(new NetworkModificationException(reportError).getMessage(), exception.getMessage()); } private void testIpMinGreaterThanIpMax() { @@ -168,7 +167,7 @@ private void testSetIpMinOnEquipmentWithoutExtension() { Network network = getNetwork(); VoltageLevelModification voltageLevelModification = (VoltageLevelModification) vli.toModification(); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> voltageLevelModification.check(network)); - assertEquals(new NetworkModificationException(MODIFY_VOLTAGE_LEVEL_ERROR, "IpMax is required").getMessage(), exception.getMessage()); + assertEquals("IpMax is required", exception.getMessage()); } private void testSetNominalVoltage() { @@ -181,7 +180,7 @@ private void testSetNominalVoltage() { Network network = getNetwork(); VoltageLevelModification voltageLevelModification = (VoltageLevelModification) vli.toModification(); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> voltageLevelModification.check(network)); - assertEquals(new NetworkModificationException(MODIFY_VOLTAGE_LEVEL_ERROR, "Voltage level 'v2' : can not have a negative value for Nominal Voltage").getMessage(), exception.getMessage()); + assertEquals(new NetworkModificationException("Voltage level 'v2' : can not have a negative value for Nominal Voltage").getMessage(), exception.getMessage()); } private void testSetLowVoltageLimit() { @@ -194,7 +193,7 @@ private void testSetLowVoltageLimit() { Network network = getNetwork(); VoltageLevelModification voltageLevelModification = (VoltageLevelModification) vli.toModification(); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> voltageLevelModification.check(network)); - assertEquals(new NetworkModificationException(MODIFY_VOLTAGE_LEVEL_ERROR, "Voltage level 'v2' : can not have a negative value for Low voltage limit").getMessage(), exception.getMessage()); + assertEquals(new NetworkModificationException("Voltage level 'v2' : can not have a negative value for Low voltage limit").getMessage(), exception.getMessage()); } private void testSetHighVoltageLimit() { @@ -207,7 +206,7 @@ private void testSetHighVoltageLimit() { Network network = getNetwork(); VoltageLevelModification voltageLevelModification = (VoltageLevelModification) vli.toModification(); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> voltageLevelModification.check(network)); - assertEquals(new NetworkModificationException(MODIFY_VOLTAGE_LEVEL_ERROR, "Voltage level 'v2' : can not have a negative value for High voltage limit").getMessage(), exception.getMessage()); + assertEquals(new NetworkModificationException("Voltage level 'v2' : can not have a negative value for High voltage limit").getMessage(), exception.getMessage()); } @Test diff --git a/src/test/java/org/gridsuite/modification/modifications/VoltageLevelTopologyModificationTest.java b/src/test/java/org/gridsuite/modification/modifications/VoltageLevelTopologyModificationTest.java index 91f5fa7d..fc1f1b18 100644 --- a/src/test/java/org/gridsuite/modification/modifications/VoltageLevelTopologyModificationTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/VoltageLevelTopologyModificationTest.java @@ -21,7 +21,6 @@ import java.util.*; -import static org.gridsuite.modification.NetworkModificationException.Type.*; import static org.gridsuite.modification.utils.TestUtils.assertLogMessage; import static org.junit.jupiter.api.Assertions.*; @@ -115,9 +114,7 @@ private void testCheckWithVoltageLevelNotFound() { VoltageLevelTopologyModification voltageLevelTopologyModification = new VoltageLevelTopologyModification(modificationInfos); applyModification(voltageLevelTopologyModification); Network network = getNetwork(); - NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> voltageLevelTopologyModification.check(network)); - - assertEquals(VOLTAGE_LEVEL_NOT_FOUND, exception.getType()); + assertThrows(NetworkModificationException.class, () -> voltageLevelTopologyModification.check(network)); } private void testCheckWithEmptyEquipmentAttributeModifications() { @@ -131,8 +128,6 @@ private void testCheckWithEmptyEquipmentAttributeModifications() { VoltageLevelTopologyModification voltageLevelTopologyModification = new VoltageLevelTopologyModification(modificationInfos); Network network = getNetwork(); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> voltageLevelTopologyModification.check(network)); - - assertEquals(MODIFY_VOLTAGE_LEVEL_TOPOLOGY_ERROR, exception.getType()); assertTrue(exception.getMessage().contains("Missing required switches")); } @@ -155,8 +150,6 @@ private void testCheckWithEquipmentAttributeNotFound() { VoltageLevelTopologyModification voltageLevelTopologyModification = new VoltageLevelTopologyModification(modificationInfos); Network network = getNetwork(); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> voltageLevelTopologyModification.check(network)); - - assertEquals(EQUIPMENT_NOT_FOUND, exception.getType()); } private void testCheckLogMessages() { diff --git a/src/test/java/org/gridsuite/modification/modifications/VscCreationTest.java b/src/test/java/org/gridsuite/modification/modifications/VscCreationTest.java index 4f4ae33c..7110da2a 100644 --- a/src/test/java/org/gridsuite/modification/modifications/VscCreationTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/VscCreationTest.java @@ -21,7 +21,6 @@ import java.util.UUID; import static org.assertj.core.api.Assertions.assertThat; -import static org.gridsuite.modification.NetworkModificationException.Type.*; import static org.gridsuite.modification.modifications.VscModification.ACTIVE_POWER_CONTROL_DROOP_P0_REQUIRED_ERROR_MSG; import static org.junit.jupiter.api.Assertions.*; @@ -178,7 +177,7 @@ protected void checkModification() { vscCreationInfos.setConverterStation2(converterStationCreationInfos); VscCreation vscCreation = (VscCreation) vscCreationInfos.toModification(); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> vscCreation.check(network)); - assertEquals(new NetworkModificationException(VOLTAGE_LEVEL_NOT_FOUND, "notFoundVoltageLevelId").getMessage(), exception.getMessage()); + assertEquals("Voltage level notFoundVoltageLevelId does not exist in network", exception.getMessage()); // invalid min max reactive limit vscCreationInfos = (VscCreationInfos) buildModification(); @@ -190,7 +189,7 @@ protected void checkModification() { VscCreation vscCreation1 = (VscCreation) vscCreationInfos.toModification(); exception = assertThrows(NetworkModificationException.class, () -> vscCreation1.check(network)); - assertEquals(new NetworkModificationException(CREATE_VSC_ERROR, "Vsc 'vsc1' : minimum reactive power is not set").getMessage(), exception.getMessage()); + assertEquals(new NetworkModificationException("Vsc 'vsc1' : minimum reactive power is not set").getMessage(), exception.getMessage()); vscCreationInfos = (VscCreationInfos) buildModification(); converterStationCreationInfos = buildConverterStationWithMinMaxReactiveLimits(); @@ -201,7 +200,7 @@ protected void checkModification() { VscCreation vscCreation2 = (VscCreation) vscCreationInfos.toModification(); exception = assertThrows(NetworkModificationException.class, () -> vscCreation2.check(network)); - assertEquals(new NetworkModificationException(CREATE_VSC_ERROR, "Vsc 'vsc1' : maximum reactive power is not set").getMessage(), exception.getMessage()); + assertEquals(new NetworkModificationException("Vsc 'vsc1' : maximum reactive power is not set").getMessage(), exception.getMessage()); vscCreationInfos = (VscCreationInfos) buildModification(); converterStationCreationInfos = buildConverterStationWithMinMaxReactiveLimits(); @@ -213,7 +212,7 @@ protected void checkModification() { VscCreation vscCreation3 = (VscCreation) vscCreationInfos.toModification(); exception = assertThrows(NetworkModificationException.class, () -> vscCreation3.check(network)); - assertEquals(new NetworkModificationException(CREATE_VSC_ERROR, "Vsc 'vsc1' : maximum reactive power is expected to be greater than or equal to minimum reactive power").getMessage(), exception.getMessage()); + assertEquals(new NetworkModificationException("Vsc 'vsc1' : maximum reactive power is expected to be greater than or equal to minimum reactive power").getMessage(), exception.getMessage()); // invalid reactive capability curve limit vscCreationInfos = (VscCreationInfos) buildModification(); @@ -224,14 +223,14 @@ protected void checkModification() { VscCreation vscCreation4 = (VscCreation) vscCreationInfos.toModification(); exception = assertThrows(NetworkModificationException.class, () -> vscCreation4.check(network)); - assertEquals(new NetworkModificationException(CREATE_VSC_ERROR, "Vsc 'vsc1' : P is not set in a reactive capability curve limits point").getMessage(), exception.getMessage()); + assertEquals(new NetworkModificationException("Vsc 'vsc1' : P is not set in a reactive capability curve limits point").getMessage(), exception.getMessage()); // try to create an existing vsc vscCreationInfos = (VscCreationInfos) buildModification(); vscCreationInfos.setEquipmentId("hvdcLine"); VscCreation vscCreation5 = (VscCreation) vscCreationInfos.toModification(); exception = assertThrows(NetworkModificationException.class, () -> vscCreation5.check(network)); - assertEquals(new NetworkModificationException(HVDC_LINE_ALREADY_EXISTS, "hvdcLine").getMessage(), exception.getMessage()); + assertEquals("HVDC line already exists: hvdcLine", exception.getMessage()); VscCreationInfos vscCreationInfos6 = VscCreationInfos.builder() .equipmentId("hvdcLine2") @@ -242,7 +241,7 @@ protected void checkModification() { VscCreation vscCreation6 = (VscCreation) vscCreationInfos6.toModification(); String message = assertThrows(NetworkModificationException.class, () -> vscCreation6.check(network)).getMessage(); - assertEquals("CREATE_VSC_ERROR : HVDC vsc 'hvdcLine2' : can not have a negative value for Resistance R", message); + assertEquals("HVDC vsc 'hvdcLine2' : can not have a negative value for Resistance R", message); VscCreationInfos vscCreationInfos7 = VscCreationInfos.builder() .equipmentId("hvdcLine2") @@ -257,7 +256,7 @@ protected void checkModification() { VscCreation vscCreation7 = (VscCreation) vscCreationInfos7.toModification(); message = assertThrows(NetworkModificationException.class, () -> vscCreation7.check(network)).getMessage(); - assertEquals("CREATE_VSC_ERROR : HVDC vsc 'hvdcLine2' : can not have a negative value for voltage set point side 1", message); + assertEquals("HVDC vsc 'hvdcLine2' : can not have a negative value for voltage set point side 1", message); VscCreationInfos vscCreationInfos8 = VscCreationInfos.builder() .equipmentId("hvdcLine2") @@ -272,7 +271,7 @@ protected void checkModification() { VscCreation vscCreation8 = (VscCreation) vscCreationInfos8.toModification(); message = assertThrows(NetworkModificationException.class, () -> vscCreation8.check(network)).getMessage(); - assertEquals("CREATE_VSC_ERROR : HVDC vsc 'hvdcLine2' : can not have a negative value for voltage set point side 2", message); + assertEquals("HVDC vsc 'hvdcLine2' : can not have a negative value for voltage set point side 2", message); VscCreationInfos vscCreationInfos9 = VscCreationInfos.builder() .equipmentId("hvdcLine2") @@ -283,7 +282,7 @@ protected void checkModification() { VscCreation vscCreation9 = (VscCreation) vscCreationInfos9.toModification(); message = assertThrows(NetworkModificationException.class, () -> vscCreation9.check(network)).getMessage(); - assertEquals("CREATE_VSC_ERROR : HVDC vsc 'hvdcLine2' : can not have a negative value for Nominal voltage", message); + assertEquals("HVDC vsc 'hvdcLine2' : can not have a negative value for Nominal voltage", message); VscCreationInfos vscCreationInfos10 = VscCreationInfos.builder() .equipmentId("hvdcLine2") @@ -298,7 +297,7 @@ protected void checkModification() { VscCreation vscCreation10 = (VscCreation) vscCreationInfos10.toModification(); message = assertThrows(NetworkModificationException.class, () -> vscCreation10.check(network)).getMessage(); - assertEquals("CREATE_VSC_ERROR : HVDC vsc 'hvdcLine2' : must have loss factor side 2 between 0 and 100", message); + assertEquals("HVDC vsc 'hvdcLine2' : must have loss factor side 2 between 0 and 100", message); VscCreationInfos vscCreationInfos11 = VscCreationInfos.builder() .equipmentId("hvdcLine2") @@ -313,7 +312,7 @@ protected void checkModification() { VscCreation vscCreation11 = (VscCreation) vscCreationInfos11.toModification(); message = assertThrows(NetworkModificationException.class, () -> vscCreation11.check(network)).getMessage(); - assertEquals("CREATE_VSC_ERROR : HVDC vsc 'hvdcLine2' : must have loss factor side 1 between 0 and 100", message); + assertEquals("HVDC vsc 'hvdcLine2' : must have loss factor side 1 between 0 and 100", message); } @Test @@ -379,8 +378,7 @@ private void checkDroopWithAbsentInfos(VscCreationInfos vscCreationInfos) { Network network = getNetwork(); VscCreation vscCreation = (VscCreation) vscCreationInfos.toModification(); NetworkModificationException exception = assertThrows(NetworkModificationException.class, () -> vscCreation.check(network)); - assertEquals(new NetworkModificationException(WRONG_HVDC_ANGLE_DROOP_ACTIVE_POWER_CONTROL, - ACTIVE_POWER_CONTROL_DROOP_P0_REQUIRED_ERROR_MSG).getMessage(), + assertEquals(new NetworkModificationException(ACTIVE_POWER_CONTROL_DROOP_P0_REQUIRED_ERROR_MSG).getMessage(), exception.getMessage()); } } diff --git a/src/test/java/org/gridsuite/modification/modifications/VscModificationTest.java b/src/test/java/org/gridsuite/modification/modifications/VscModificationTest.java index 0f3d7f55..381d8c62 100644 --- a/src/test/java/org/gridsuite/modification/modifications/VscModificationTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/VscModificationTest.java @@ -24,7 +24,6 @@ import java.util.stream.IntStream; import static org.assertj.core.api.Assertions.assertThat; -import static org.gridsuite.modification.NetworkModificationException.Type.WRONG_HVDC_ANGLE_DROOP_ACTIVE_POWER_CONTROL; import static org.gridsuite.modification.modifications.VscModification.ACTIVE_POWER_CONTROL_DROOP_P0_REQUIRED_ERROR_MSG; import static org.junit.jupiter.api.Assertions.*; /** @@ -241,8 +240,7 @@ private static void checkDroopWithAbsentInfos(VscModificationInfos modificationI String message = assertThrows(NetworkModificationException.class, () -> vscModification.check(networkWithoutExt)) .getMessage(); - assertThat(message).isEqualTo(WRONG_HVDC_ANGLE_DROOP_ACTIVE_POWER_CONTROL.name() + " : " - + ACTIVE_POWER_CONTROL_DROOP_P0_REQUIRED_ERROR_MSG); + assertThat(message).isEqualTo(ACTIVE_POWER_CONTROL_DROOP_P0_REQUIRED_ERROR_MSG); } @Test @@ -374,7 +372,7 @@ protected void checkModification() { VscModification vscModification = (VscModification) vscModificationInfos.toModification(); String message = assertThrows(NetworkModificationException.class, () -> vscModification.check(network)).getMessage(); - assertEquals("MODIFY_VSC_ERROR : HVDC vsc 'hvdcLine' : can not have a negative value for Resistance R", message); + assertEquals("HVDC vsc 'hvdcLine' : can not have a negative value for Resistance R", message); VscModificationInfos vscModificationInfos2 = VscModificationInfos.builder() .equipmentId("hvdcLine") @@ -387,7 +385,7 @@ protected void checkModification() { VscModification vscModification2 = (VscModification) vscModificationInfos2.toModification(); message = assertThrows(NetworkModificationException.class, () -> vscModification2.check(network)).getMessage(); - assertEquals("MODIFY_VSC_ERROR : HVDC vsc 'hvdcLine' : can not have a negative value for voltage set point side 1", message); + assertEquals("HVDC vsc 'hvdcLine' : can not have a negative value for voltage set point side 1", message); VscModificationInfos vscModificationInfos3 = VscModificationInfos.builder() .equipmentId("hvdcLine") @@ -400,7 +398,7 @@ protected void checkModification() { VscModification vscModification3 = (VscModification) vscModificationInfos3.toModification(); message = assertThrows(NetworkModificationException.class, () -> vscModification3.check(network)).getMessage(); - assertEquals("MODIFY_VSC_ERROR : HVDC vsc 'hvdcLine' : can not have a negative value for voltage set point side 2", message); + assertEquals("HVDC vsc 'hvdcLine' : can not have a negative value for voltage set point side 2", message); VscModificationInfos vscModificationInfos4 = VscModificationInfos.builder() .equipmentId("hvdcLine") @@ -411,7 +409,7 @@ protected void checkModification() { VscModification vscModification4 = (VscModification) vscModificationInfos4.toModification(); message = assertThrows(NetworkModificationException.class, () -> vscModification4.check(network)).getMessage(); - assertEquals("MODIFY_VSC_ERROR : HVDC vsc 'hvdcLine' : can not have a negative value for Nominal voltage", message); + assertEquals("HVDC vsc 'hvdcLine' : can not have a negative value for Nominal voltage", message); VscModificationInfos vscModificationInfos5 = VscModificationInfos.builder() .equipmentId("hvdcLine") @@ -424,7 +422,7 @@ protected void checkModification() { VscModification vscModification5 = (VscModification) vscModificationInfos5.toModification(); message = assertThrows(NetworkModificationException.class, () -> vscModification5.check(network)).getMessage(); - assertEquals("MODIFY_VSC_ERROR : HVDC vsc 'hvdcLine' : must have loss factor side 2 between 0 and 100", message); + assertEquals("HVDC vsc 'hvdcLine' : must have loss factor side 2 between 0 and 100", message); VscModificationInfos vscModificationInfos6 = VscModificationInfos.builder() .equipmentId("hvdcLine") @@ -437,6 +435,6 @@ protected void checkModification() { VscModification vscModification6 = (VscModification) vscModificationInfos6.toModification(); message = assertThrows(NetworkModificationException.class, () -> vscModification6.check(network)).getMessage(); - assertEquals("MODIFY_VSC_ERROR : HVDC vsc 'hvdcLine' : must have loss factor side 1 between 0 and 100", message); + assertEquals("HVDC vsc 'hvdcLine' : must have loss factor side 1 between 0 and 100", message); } } diff --git a/src/test/java/org/gridsuite/modification/modifications/byfilterdeletion/AbstractByFilterDeletionTest.java b/src/test/java/org/gridsuite/modification/modifications/byfilterdeletion/AbstractByFilterDeletionTest.java index 2cf11be8..c3a56be3 100644 --- a/src/test/java/org/gridsuite/modification/modifications/byfilterdeletion/AbstractByFilterDeletionTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/byfilterdeletion/AbstractByFilterDeletionTest.java @@ -126,7 +126,7 @@ void testCreateAllFiltersWrong() throws Exception { .withMessageTemplate("test") .build()); byFilterDeletion.apply(getNetwork(), report); - assertLogMessage(byFilterDeletionInfos.getErrorType().name() + ": There is no valid equipment ID among the provided filter(s)", + assertLogMessage("There is no valid equipment ID among the provided filter(s)", "network.modification.invalidFilters", report); }