Sonar fixes & refacto

farao-community · Jan 29, 2025 · f7a520d · f7a520d
1 parent 234db35
commit f7a520d
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 36 deletions.
diff --git a/cse-lib/data/src/main/java/com/farao_community/farao/cse/data/ntc/NtcUtil.java b/cse-lib/data/src/main/java/com/farao_community/farao/cse/data/ntc/NtcUtil.java
@@ -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;
+        };
     }
 }
diff --git a/cse-lib/data/src/main/java/com/farao_community/farao/cse/data/ntc/NtcUtilAdapted.java b/cse-lib/data/src/main/java/com/farao_community/farao/cse/data/ntc/NtcUtilAdapted.java
@@ -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);
     }
 }
diff --git a/cse-lib/data/src/test/java/com/farao_community/farao/cse/data/ntc/NtcFilesTest.java b/cse-lib/data/src/test/java/com/farao_community/farao/cse/data/ntc/NtcFilesTest.java
@@ -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);