Skip to content

Commit

Permalink
fix remarks review
Browse files Browse the repository at this point in the history
  • Loading branch information
@ghazwarhili
ghazwarhili committed Oct 2, 2024
1 parent 7b59130 commit aa9458b
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
40 changes: 20 additions & 20 deletions src/main/java/org/gridsuite/modification/server/modifications/ModificationUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,7 @@ private boolean isVoltageOrBusbarIdMissing(AttributeModification<String> voltage

private void processConnectivityPosition(ConnectablePosition<?> connectablePosition,
ConnectablePositionAdder<?> connectablePositionAdder,
Object modificationInfos,
BasicEquipmentModificationInfos modificationInfos,
Network network,
List<ReportNode> reports,
boolean isBranch) {
Expand All @@ -660,7 +660,7 @@ private void processConnectivityPosition(ConnectablePosition<?> connectablePosit
}

private void modifyExistingConnectivityPosition(ConnectablePosition<?> connectablePosition,
Object modificationInfos,
BasicEquipmentModificationInfos modificationInfos,
List<ReportNode> reports,
boolean isBranch) {
if (isBranch) {
Expand All @@ -672,7 +672,7 @@ private void modifyExistingConnectivityPosition(ConnectablePosition<?> connectab
}

private void createNewConnectivityPosition(ConnectablePositionAdder<?> adder,
Object modificationInfos,
BasicEquipmentModificationInfos modificationInfos,
Network network,
List<ReportNode> reports,
boolean isBranch) {
Expand All @@ -688,14 +688,14 @@ private void createNewConnectivityPosition(ConnectablePositionAdder<?> adder,
}

private void modifyFeeder(ConnectablePosition.Feeder feeder,
Object modificationInfos,
BasicEquipmentModificationInfos modificationInfos,
List<ReportNode> reports,
int feederNumber) {
applyModifications(feeder, modificationInfos, reports, feederNumber);
}

private void applyModifications(ConnectablePosition.Feeder feeder,
Object modificationInfos,
BasicEquipmentModificationInfos modificationInfos,
List<ReportNode> reports,
int feederNumber) {
ReportNode connectionNameReport = applyElementaryModificationsAndReturnReport(feeder::setName,
Expand All @@ -722,17 +722,17 @@ private void applyModifications(ConnectablePosition.Feeder feeder,
}

private void modifyFeederAdder(ConnectablePositionAdder.FeederAdder<?> feeder,
Object modificationInfos,
BasicEquipmentModificationInfos modificationInfos,
Network network,
List<ReportNode> reports,
int feederNumber) {
var connectionName = getConnectionName(modificationInfos, feederNumber);
var connectionDirection = getConnectionDirection(modificationInfos, feederNumber);
var connectionPosition = getConnectionPosition(modificationInfos, feederNumber);
var equipmentId = getEquipmentId(modificationInfos);
var voltageLevelId = getVoltageLevelId(modificationInfos, feederNumber);
var busOrBusbarSectionId = getBusOrBusbarSectionId(modificationInfos, feederNumber);
var position = getPosition(connectionPosition == null ? null : connectionPosition.getValue(),
AttributeModification<String> connectionName = getConnectionName(modificationInfos, feederNumber);
AttributeModification<ConnectablePosition.Direction> connectionDirection = getConnectionDirection(modificationInfos, feederNumber);
AttributeModification<Integer> connectionPosition = getConnectionPosition(modificationInfos, feederNumber);
AttributeModification<String> equipmentId = getEquipmentId(modificationInfos);
AttributeModification<String> voltageLevelId = getVoltageLevelId(modificationInfos, feederNumber);
AttributeModification<String> busOrBusbarSectionId = getBusOrBusbarSectionId(modificationInfos, feederNumber);
int position = getPosition(connectionPosition == null ? null : connectionPosition.getValue(),
busOrBusbarSectionId == null ? null : busOrBusbarSectionId.getValue(),
network,
getVoltageLevel(network, voltageLevelId == null ? null : voltageLevelId.getValue()));
Expand Down Expand Up @@ -764,7 +764,7 @@ private void modifyFeederAdder(ConnectablePositionAdder.FeederAdder<?> feeder,
}
}

private <T> T getConnectionDetail(Object modificationInfos, int feederNumber,
private <T> T getConnectionDetail(BasicEquipmentModificationInfos modificationInfos, int feederNumber,
Function<BranchModificationInfos, T> branchFunc1,
Function<BranchModificationInfos, T> branchFunc2,
Function<InjectionModificationInfos, T> injectionFunc) {
Expand All @@ -785,19 +785,19 @@ private String getConnectionFieldName(int feederNumber, String baseFieldName) {
};
}

private AttributeModification<String> getVoltageLevelId(Object modificationInfos, int feederNumber) {
private AttributeModification<String> getVoltageLevelId(BasicEquipmentModificationInfos modificationInfos, int feederNumber) {
return getConnectionDetail(modificationInfos, feederNumber,
BranchModificationInfos::getVoltageLevelId1, BranchModificationInfos::getVoltageLevelId2,
InjectionModificationInfos::getVoltageLevelId);
}

private AttributeModification<String> getBusOrBusbarSectionId(Object modificationInfos, int feederNumber) {
private AttributeModification<String> getBusOrBusbarSectionId(BasicEquipmentModificationInfos modificationInfos, int feederNumber) {
return getConnectionDetail(modificationInfos, feederNumber,
BranchModificationInfos::getBusOrBusbarSectionId1, BranchModificationInfos::getBusOrBusbarSectionId2,
InjectionModificationInfos::getBusOrBusbarSectionId);
}

private AttributeModification<String> getEquipmentId(Object modificationInfos) {
private AttributeModification<String> getEquipmentId(BasicEquipmentModificationInfos modificationInfos) {
if (modificationInfos instanceof BranchModificationInfos branchInfo) {
return AttributeModification.toAttributeModification(branchInfo.getEquipmentId(), OperationType.SET);
} else if (modificationInfos instanceof InjectionModificationInfos injectionInfo) {
Expand All @@ -806,7 +806,7 @@ private AttributeModification<String> getEquipmentId(Object modificationInfos) {
return null;
}

private AttributeModification<String> getConnectionName(Object modificationInfos, int feederNumber) {
private AttributeModification<String> getConnectionName(BasicEquipmentModificationInfos modificationInfos, int feederNumber) {
return getConnectionDetail(modificationInfos, feederNumber,
BranchModificationInfos::getConnectionName1, BranchModificationInfos::getConnectionName2,
InjectionModificationInfos::getConnectionName);
Expand All @@ -824,13 +824,13 @@ private String getConnectionPositionField(int feederNumber) {
return getConnectionFieldName(feederNumber, CONNECTION_POSITION_FIELD_NAME);
}

private AttributeModification<ConnectablePosition.Direction> getConnectionDirection(Object modificationInfos, int feederNumber) {
private AttributeModification<ConnectablePosition.Direction> getConnectionDirection(BasicEquipmentModificationInfos modificationInfos, int feederNumber) {
return getConnectionDetail(modificationInfos, feederNumber,
BranchModificationInfos::getConnectionDirection1, BranchModificationInfos::getConnectionDirection2,
InjectionModificationInfos::getConnectionDirection);
}

private AttributeModification<Integer> getConnectionPosition(Object modificationInfos, int feederNumber) {
private AttributeModification<Integer> getConnectionPosition(BasicEquipmentModificationInfos modificationInfos, int feederNumber) {
return getConnectionDetail(modificationInfos, feederNumber,
BranchModificationInfos::getConnectionPosition1, BranchModificationInfos::getConnectionPosition2,
InjectionModificationInfos::getConnectionPosition);
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/gridsuite/modification/server/utils/NetworkUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public static void createLine(Network network, String id, String name, String vo

public static void createLineWithoutConnectivity(Network network, String id, String name, String voltageLevel1, String voltageLevel2, int node1, int node2,
double r, double x, double g1, double g2, double b1, double b2) {
var l = network.newLine()
network.newLine()
.setId(id)
.setName(name)
.setR(r)
Expand Down Expand Up @@ -178,7 +178,7 @@ public static void createGenerator(VoltageLevel vl, String id, int node, double
}

public static void createGeneratorOnBus(VoltageLevel vl, String id, String busId, double targetP, double targetQ) {
var g = vl.newGenerator()
vl.newGenerator()
.setId(id)
.setName(id)
.setTargetP(targetP)
Expand Down

0 comments on commit aa9458b

Please sign in to comment.