Skip to content
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

Jump to bottom

Sonar cleaning complex #1122

Merged
merged 38 commits into from
Oct 7, 2024
Merged

Sonar cleaning complex #1122

merged 38 commits into from
Oct 7, 2024

Conversation

phiedw
Copy link
Collaborator

@phiedw phiedw commented Sep 2, 2024

Please check if the PR fulfills these requirements

  • The commit message follows our guidelines
  • Tests for the changes have been added (for bug fixes / features)

Does this PR already have an issue describing the problem?

No

What kind of change does this PR introduce?

Code clean up

What is the current behavior?

Many complex sonar code smells.

What is the new behavior (if this is a feature change)?
Fewer code smells.

Does this PR introduce a breaking change or deprecate an API?

  • Yes
  • No

phiedw and others added 22 commits August 29, 2024 10:32
@phiedw
local variables shadowing class fields
246fdfb 
Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com>
@phiedw
empty methods
59c9051 
Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com>
@phiedw
commented code
961c6ac 
Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com>
@phiedw
remove deprecated reference to isOk()
403bd21 
Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com>
@phiedw
runtime exception checkcs
8eaad87 
Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com>
@phiedw
duplicated strings
3f46166 
Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com>
@phiedw
junit test public identifier
83f1d46 
Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com>
@phiedw
assert order
f34f43b 
Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com>
@phiedw
empty blocks
4fa0982 
Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com>
@phiedw
remove unused local variables
8631494 
Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com>
@phiedw
remove unused methods
10f59f1 
Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com>
@phiedw
add override where missing and remove impossible exception from signa…
56abca4 
…tures

Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com>
@phiedw
throw specific exceptions and make some variables static final
6e7fab5 
Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com>
@phiedw
Merge branch 'main' into sonar_cleaning
d6ea8bd
@phiedw
Merge branch 'main' into sonar_cleaning
0715195
@phiedw
removed unreachable code for mnecs in core cne exporter
4ec4c63 
Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com>
@phiedw
Merge branch 'sonar_cleaning' of https://github.com/powsybl/open-rao …
53c6583 
…into sonar_cleaning
@phiedw
remove from signature exception that cannot be thrown
a768236 
Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com>
@phiedw
identical tests
fa35deb 
Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com>
@phiedw
various rule fixing
04d94f5 
Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com>
@phiedw
removed unnecessary line break in log
1761fce 
Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com>
@phiedw
combine all cnecs in cim crac importer OnConstraint usage rules
ac1bf69 
Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com>
@phiedw phiedw changed the base branch from main to sonar_cleaning September 2, 2024 11:41
@phiedw
try reduce complexity of MonitoredSeriesCreator
f7f2688 
Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com>
Base automatically changed from sonar_cleaning to main September 2, 2024 13:20
@phiedw
Merge branch 'main' into sonar_cleaning_complex
c085a45 
Signed-off-by: phiedw <philippe.edwards@rte-france.com>
@phiedw
remove unused parameter
c513444 
Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com>
@phiedw
Merge branch 'sonar_cleaning_complex' of https://github.com/powsybl/o…
da839a7 
…pen-rao into sonar_cleaning_complex
@phiedw
moved things around a bit in csa profiles
de791e5 
Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com>
@phiedw
reverted some changes for csa profile usage rules
e9678bf 
Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com>
@phiedw
separate contingency scenarios from CastorFullOptimization
cbd4b09 
Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com>
@phiedw
move more things from CastorFullOpt to SecondPrev or Crac
978356e 
Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com>
@phiedw
Merge branch 'main' of https://github.com/powsybl/open-rao into sonar…
c15eff5 
…_cleaning_complex

Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com>
@phiedw
code smells fixing
c443470 
Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com>
@phiedw
Merge branch 'main' into sonar_cleaning_complex
b2ec335
@phiedw
fix more code smells
f9a50d2 
Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com>
@phiedw
Merge branch 'sonar_cleaning_complex' of https://github.com/powsybl/o…
11741ac 
…pen-rao into sonar_cleaning_complex
@phiedw
removed unused constant
039bc46 
Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com>
@phiedw phiedw added PR: waiting-for-review This PR is waiting to be reviewed cleaning This issue or pull request only concerns improving the overall state of the code labels Sep 12, 2024
Godelaine
Godelaine reviewed Sep 17, 2024
View reviewed changes
...c/main/java/com/powsybl/openrao/data/cracio/cim/craccreator/RemedialActionSeriesCreator.java Outdated Show resolved Hide resolved
...im/src/main/java/com/powsybl/openrao/data/cracio/cim/craccreator/MonitoredSeriesCreator.java Outdated
if (!instant.isPreventive()) {
flowCnecAdder.withContingency(contingencyId);
cnecId += " - " + contingencyId;
cnecIdCopy += " - " + contingencyId;
}
flowCnecAdder.withInstant(instant.getId());
Copy link
Collaborator

Choose a reason for hiding this comment

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

already added

...im/src/main/java/com/powsybl/openrao/data/cracio/cim/craccreator/MonitoredSeriesCreator.java Outdated
private void addCnecsOnState(FlowCnecAdder flowCnecAdder, String cnecId, Contingency contingency, Instant instant, MeasurementCreationContext measurementCreationContext, String networkElementId) {
String contingencyId = Objects.isNull(contingency) ? "" : contingency.getId();
String cnecIdCopy = cnecId;

if (!instant.isPreventive()) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

you could add this in previous if/else preventive check

phiedw and others added 2 commits October 7, 2024 11:06
@phiedw
modifications after review
3a00737 
Signed-off-by: Philippe Edwards <philippe.edwards@rte-france.com>
@Godelaine
Merge branch 'main' into sonar_cleaning_complex
159f095
@Godelaine Godelaine merged commit f9e2e87 into main Oct 7, 2024
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Godelaine Godelaine Godelaine approved these changes

Assignees
No one assigned
Labels
cleaning This issue or pull request only concerns improving the overall state of the code PR: waiting-for-review This PR is waiting to be reviewed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@phiedw @Godelaine