Skip to content

feat(error-handling): remove HTTP statuses from error types #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TheMaskedTurtle wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(error-handling): remove HTTP statuses from error types #147

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
241 changes: 116 additions & 125 deletions src/main/java/org/gridsuite/modification/NetworkModificationException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

import com.powsybl.commons.PowsyblException;
import com.powsybl.iidm.network.IdentifiableType;
import lombok.Getter;
import lombok.NonNull;

import org.gridsuite.modification.dto.OperatingStatusModificationInfos;
import org.springframework.http.HttpStatus;

import java.util.Objects;

Expand All @@ -21,132 +21,127 @@
* @author Slimane Amar <slimane.amar at rte-france.com>
* @author Franck Lecuyer <franck.lecuyer at rte-france.com>
*/
@Getter
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;
GROOVY_SCRIPT_EMPTY("Empty script"),
GROOVY_SCRIPT_ERROR,
NETWORK_NOT_FOUND,
VARIANT_NOT_FOUND,
Comment on lines +29 to +30
Copy link
Contributor

@Meklo Meklo Jan 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All uses of these two were removed in gridsuite/network-modification-server#752, can be removed ?

NOTHING_TO_DELETE,
MODIFICATION_DELETION_ERROR,
MODIFICATION_GROUP_NOT_FOUND,
MODIFICATION_NOT_FOUND,
SWITCH_NOT_FOUND,
LINE_NOT_FOUND,
LOAD_NOT_FOUND,
BATTERY_NOT_FOUND,
GENERATOR_NOT_FOUND,
TWO_WINDINGS_TRANSFORMER_NOT_FOUND,
UNKNOWN_MODIFICATION_TYPE,
UNKNOWN_EQUIPMENT_TYPE,
WRONG_EQUIPMENT_TYPE,
MODIFICATION_ERROR,
VOLTAGE_LEVEL_NOT_FOUND,
CREATE_LOAD_ERROR,
MODIFY_LOAD_ERROR,
BUSBAR_SECTION_NOT_FOUND,
BUS_NOT_FOUND,
CREATE_BATTERY_ERROR,
CREATE_GENERATOR_ERROR,
CREATE_SHUNT_COMPENSATOR_ERROR,
MODIFY_SHUNT_COMPENSATOR_ERROR,
CREATE_STATIC_VAR_COMPENSATOR_ERROR,
DELETE_EQUIPMENT_ERROR,
BY_FILTER_DELETION_ERROR,
EQUIPMENT_NOT_FOUND,
ATTRIBUTE_NOT_EDITABLE,
CREATE_LINE_ERROR,
MODIFY_LINE_ERROR,
CREATE_TWO_WINDINGS_TRANSFORMER_ERROR,
MODIFY_TWO_WINDINGS_TRANSFORMER_ERROR,
CREATE_SUBSTATION_ERROR,
MODIFY_SUBSTATION_ERROR,
CREATE_VOLTAGE_LEVEL_ERROR,
MODIFY_VOLTAGE_LEVEL_ERROR,
SUBSTATION_NOT_FOUND,
BATTERY_ALREADY_EXISTS,
LOAD_ALREADY_EXISTS,
VOLTAGE_LEVEL_ALREADY_EXISTS,
BUSBAR_SECTION_ALREADY_EXISTS,
BUSBAR_SECTION_NOT_DEFINED,
GENERATOR_ALREADY_EXISTS,
SHUNT_COMPENSATOR_ALREADY_EXISTS,
SHUNT_COMPENSATOR_NOT_FOUND,
STATIC_VAR_COMPENSATOR_ALREADY_EXISTS,
STATIC_VAR_COMPENSATOR_NOT_FOUND,
LINE_ALREADY_EXISTS,
TWO_WINDINGS_TRANSFORMER_ALREADY_EXISTS,
TWO_WINDINGS_TRANSFORMER_CREATION_ERROR,
BRANCH_MODIFICATION_ERROR,
INJECTION_MODIFICATION_ERROR,
MODIFY_BATTERY_ERROR,
OPERATING_STATUS_MODIFICATION_ERROR,
OPERATING_ACTION_TYPE_EMPTY("Empty operating action type"),
OPERATING_ACTION_TYPE_UNKNOWN,
OPERATING_ACTION_TYPE_UNSUPPORTED,
EQUIPMENT_TYPE_UNSUPPORTED,
LINE_SPLIT_ERROR,
LINE_SPLIT_NOT_FOUND,
LINE_ATTACH_ERROR,
LINE_ATTACH_DESCRIPTION_ERROR,
LINE_ATTACH_NOT_FOUND,
MODIFY_GENERATOR_ERROR,
TYPE_MISMATCH,
MISSING_MODIFICATION_DESCRIPTION,
MODIFICATION_OUT_OF_RANGE,
DELETE_VOLTAGE_LEVEL_ON_LINE_ERROR,
DELETE_VOLTAGE_LEVEL_ON_LINE_NOT_FOUND,
EQUIPMENT_ATTRIBUTE_NAME_ERROR,
EQUIPMENT_ATTRIBUTE_VALUE_ERROR,
MOVE_MODIFICATION_ERROR,
GENERATOR_SCALING_ERROR,
LOAD_SCALING_ERROR,
DELETE_ATTACHING_LINE_ERROR,
DELETE_ATTACHING_LINE_NOT_FOUND,
FILTERS_NOT_FOUND,
LOAD_FLOW_PARAMETERS_NOT_FOUND,
LOAD_FLOW_PARAMETERS_FETCH_ERROR,
GENERATION_DISPATCH_ERROR,
BALANCES_ADJUSTMENT_MODIFICATION_ERROR,
VOLTAGE_INIT_MODIFICATION_ERROR,
TABULAR_MODIFICATION_ERROR,
TABULAR_CREATION_ERROR,
CREATE_VSC_ERROR,
MODIFY_VSC_ERROR,
CREATE_LCC_ERROR,
MODIFY_LCC_ERROR,
HVDC_LINE_ALREADY_EXISTS,
VSC_CONVERTER_STATION_NOT_FOUND,
LCC_CONVERTER_STATION_NOT_FOUND,
CREATE_CONVERTER_STATION_ERROR,
MODIFY_CONVERTER_STATION_ERROR,
LCC_CREATE_CONVERTER_STATION_ERROR,
LCC_MODIFY_CONVERTER_STATION_ERROR,
BY_FORMULA_MODIFICATION_ERROR,
MODIFICATION_BY_ASSIGNMENT_ERROR,
HVDC_LINE_NOT_FOUND,
COMPOSITE_MODIFICATION_ERROR,
WRONG_HVDC_ANGLE_DROOP_ACTIVE_POWER_CONTROL,
UNSUPPORTED_HYBRID_HVDC,
MODIFY_VOLTAGE_LEVEL_TOPOLOGY_ERROR,
CREATE_COUPLING_DEVICE_ERROR,
CREATE_VOLTAGE_LEVEL_TOPOLOGY_ERROR,
CREATE_VOLTAGE_LEVEL_SECTION_ERROR,
MOVE_VOLTAGE_LEVEL_FEEDER_BAYS_ERROR,;

HttpStatus getStatus() {
return status;
}
private final String message;

Type(HttpStatus status) {
this(status, null);
Type() {
this(null);
}

Type(HttpStatus status, String message) {
this.status = status;
Type(String message) {
this.message = message;
}
}
Expand All @@ -168,10 +163,6 @@ public NetworkModificationException(Type type, String 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");
}
Expand Down