Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Sonar fixes & refacto
Browse files Browse the repository at this point in the history
vbochetRTE committed Jan 29, 2025

Verified

This commit was signed with the committer’s verified signature. The key has expired.
colombod Diego Colombo
1 parent 234db35 commit 61c1d3b
Showing 4 changed files with 29 additions and 38 deletions.
Original file line number Diff line number Diff line change
@@ -18,7 +18,6 @@
import org.slf4j.Logger;
import org.springframework.stereotype.Service;

import java.io.IOException;
import java.util.Map;

/**
@@ -42,7 +41,7 @@ public NetworkShifter get(CseRequest request,
CseData cseData,
Network network,
Map<String, Double> referenceExchanges,
Map<String, Double> ntcsByEic) throws IOException {
Map<String, Double> ntcsByEic) {
return new LinearScaler(
zonalScalableProvider.get(request.getMergedGlskUrl(), network, request.getProcessType()),
getShiftDispatcher(request.getProcessType(), cseData, referenceExchanges, ntcsByEic),
Original file line number Diff line number Diff line change
@@ -6,11 +6,18 @@
*/
package com.farao_community.farao.cse.data.ntc;

import com.farao_community.farao.cse.data.*;
import com.farao_community.farao.cse.data.xsd.*;
import com.farao_community.farao.cse.data.DateTimeUtil;
import com.farao_community.farao.cse.data.xsd.TDay;
import com.farao_community.farao.cse.data.xsd.TDayOfWeek;
import com.farao_community.farao.cse.data.xsd.TLine;
import com.farao_community.farao.cse.data.xsd.TNTC;
import com.farao_community.farao.cse.data.xsd.TPeriod;
import com.farao_community.farao.cse.data.xsd.TTimeInterval;

import java.time.OffsetDateTime;
import java.util.*;
import java.util.Collections;
import java.util.List;
import java.util.Optional;

import static com.farao_community.farao.cse.data.DataUtil.toOptional;

@@ -22,7 +29,8 @@ private NtcUtil() {
}

static Optional<TNTC> getTNtcFromLine(OffsetDateTime targetDateTime, TLine tLine) {
return getTNtcFromPeriods(targetDateTime, tLine.getPeriod()).stream()
return getTNtcFromPeriods(targetDateTime, tLine.getPeriod())
.stream()
.collect(toOptional());
}

@@ -63,19 +71,13 @@ static List<TNTC> getTNtcFromTimeIntervals(OffsetDateTime targetDateTime, List<T

static boolean isTargetDayOfWeekMatchWithDayNum(int daynum, int targetDayZOfWeek) {
DayOfWeek dayOfWeek = DayOfWeek.getInstance(daynum);
switch (dayOfWeek) {
case EVERYDAY:
return true;
case SATURDAY:
return targetDayZOfWeek == DayOfWeek.SATURDAY.getDaynum();
case SUNDAY:
return targetDayZOfWeek == DayOfWeek.SUNDAY.getDaynum();
case MONTOFRI:
return targetDayZOfWeek != DayOfWeek.SATURDAY.getDaynum() && targetDayZOfWeek != DayOfWeek.SUNDAY.getDaynum();
case MONTOSAT:
return targetDayZOfWeek != DayOfWeek.SUNDAY.getDaynum();
default:
return false;
}
return switch (dayOfWeek) {
case EVERYDAY -> true;
case SATURDAY -> targetDayZOfWeek == DayOfWeek.SATURDAY.getDaynum();
case SUNDAY -> targetDayZOfWeek == DayOfWeek.SUNDAY.getDaynum();
case MONTOFRI -> targetDayZOfWeek != DayOfWeek.SATURDAY.getDaynum() && targetDayZOfWeek != DayOfWeek.SUNDAY.getDaynum();
case MONTOSAT -> targetDayZOfWeek != DayOfWeek.SUNDAY.getDaynum();
default -> false;
};
}
}
Original file line number Diff line number Diff line change
@@ -7,7 +7,12 @@
package com.farao_community.farao.cse.data.ntc;

import com.farao_community.farao.cse.data.DateTimeUtil;
import com.farao_community.farao.cse.data.xsd.ntc_adapted.*;
import com.farao_community.farao.cse.data.xsd.ntc_adapted.TDay;
import com.farao_community.farao.cse.data.xsd.ntc_adapted.TDayOfWeek;
import com.farao_community.farao.cse.data.xsd.ntc_adapted.TLine;
import com.farao_community.farao.cse.data.xsd.ntc_adapted.TNTC;
import com.farao_community.farao.cse.data.xsd.ntc_adapted.TPeriod;
import com.farao_community.farao.cse.data.xsd.ntc_adapted.TTimeInterval;

import java.time.OffsetDateTime;
import java.util.Collections;
@@ -65,20 +70,6 @@ static List<TNTC> getTNtcFromTimeIntervals(OffsetDateTime targetDateTime, List<T
}

static boolean isTargetDayOfWeekMatchWithDayNum(int daynum, int targetDayZOfWeek) {
DayOfWeek dayOfWeek = DayOfWeek.getInstance(daynum);
switch (dayOfWeek) {
case EVERYDAY:
return true;
case SATURDAY:
return targetDayZOfWeek == DayOfWeek.SATURDAY.getDaynum();
case SUNDAY:
return targetDayZOfWeek == DayOfWeek.SUNDAY.getDaynum();
case MONTOFRI:
return targetDayZOfWeek != DayOfWeek.SATURDAY.getDaynum() && targetDayZOfWeek != DayOfWeek.SUNDAY.getDaynum();
case MONTOSAT:
return targetDayZOfWeek != DayOfWeek.SUNDAY.getDaynum();
default:
return false;
}
return NtcUtil.isTargetDayOfWeekMatchWithDayNum(daynum, targetDayZOfWeek);
}
}
Original file line number Diff line number Diff line change
@@ -101,8 +101,7 @@ void testFixedFlowThrowsExceptionWhenPeriodIsMissingInTheNTcAnnualFile() {
) {
Ntc ntc1 = new Ntc(new YearlyNtcDocument(targetDateTime, DataUtil.unmarshalFromInputStream(yearlyData, NTCAnnualDocument.class)),
new DailyNtcDocument(targetDateTime, DataUtil.unmarshalFromInputStream(dailyData, NTCReductionsDocument.class)), false);
Exception exception = assertThrows(CseDataException.class,
() -> ntc1.getFlowOnFixedFlowLines());
Exception exception = assertThrows(CseDataException.class, ntc1::getFlowOnFixedFlowLines);
assertEquals("No NTC definition for line ml_mendrisio-cagno", exception.getMessage());
} catch (IOException | JAXBException e) {
throw new CseInvalidDataException("Impossible to create NTC", e);

0 comments on commit 61c1d3b

Please sign in to comment.