Removed unused imports and fixed complexity error

Author: adityaravi12

backend/src/main/java/ca/bc/gov/nrs/ilcr/configuration/SecurityConfiguration.java

@@ -25,13 +25,6 @@ public class SecurityConfiguration {
     private static final String PATH_HEALTH = "/api/health";
     private static final String PATH_INFO = "/api/info";
 
-    private static final String[] PUBLIC_PATHS = {
-        "/api",
-        PATH_HEALTH,
-        PATH_INFO,
-        "/api/prometheus"
-    };
-
     @Bean
     // java:S4502 — Disabling CSRF is safe here: this is a stateless REST API (SessionCreationPolicy
     // .STATELESS below) authenticated by bearer JWTs in the Authorization header, with no session

backend/src/main/java/ca/bc/gov/nrs/ilcr/schedule1/Schedule1Service.java

@@ -339,12 +339,8 @@ public Schedule1Response getSchedule1(long millId, int year, boolean callerMayEd
     // missing Schedule 3 — an empty map yields a null crown (no pre-fill) and null pulled costs.
     // First row per code wins (rows come back ordered by detail id) so a duplicate/corrupt row can't
     // make the crown volume or pulled costs depend on driver row order (legacy takes the first row).
-    Map<Integer, DetailRow> sch3ByCode = new HashMap<>();
-    for (DetailRow row : repository.findSchedule3Details(millId, year)) {
-      if (row.costItemCode() != null) {
-        sch3ByCode.putIfAbsent(row.costItemCode(), row);
-      }
-    }
+    Map<Integer, DetailRow> sch3ByCode =
+        firstRowPerCode(repository.findSchedule3Details(millId, year));
     DetailRow crownRow = sch3ByCode.get(CODE_SCH3_CROWN_TIMBER);
     BigDecimal sch3CrownVolume = crownRow == null ? null : crownRow.volume();
 
@@ -487,6 +483,17 @@ public CheckStatusResponse checkSchedule1Status(long millId, int year) {
     return new CheckStatusResponse(requirementsMet, errors, warnings, message);
   }
 
+  /** First stored detail row per cost-item code (later duplicates ignored); null codes skipped. */
+  private static Map<Integer, DetailRow> firstRowPerCode(List<DetailRow> rows) {
+    Map<Integer, DetailRow> byCode = new HashMap<>();
+    for (DetailRow row : rows) {
+      if (row.costItemCode() != null) {
+        byCode.putIfAbsent(row.costItemCode(), row);
+      }
+    }
+    return byCode;
+  }
+
   /** First stored detail row per (non-Other) cost-item code; later duplicates are ignored. */
   private static Map<Integer, DetailRow> indexFirstByCode(List<DetailRow> details) {
     Map<Integer, DetailRow> byCode = new HashMap<>();

backend/src/test/java/ca/bc/gov/nrs/ilcr/schedule1/Schedule1CheckStatusServiceTest.java

@@ -2,7 +2,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;

backend/src/test/java/ca/bc/gov/nrs/ilcr/schedule1/Schedule1ControllerTest.java

@@ -16,9 +16,9 @@
 import ca.bc.gov.nrs.ilcr.schedule1.dto.Schedule1Response;
 import ca.bc.gov.nrs.ilcr.security.SchedulePermissions;
 import java.util.Locale;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.context.MessageSource;
@@ -53,14 +53,9 @@ class Schedule1ControllerTest {
   @Mock
   private Authentication authentication;
 
+  @InjectMocks
   private Schedule1Controller controller;
 
-  @BeforeEach
-  void setUp() {
-    controller = new Schedule1Controller(
-        millContextService, schedule1Service, permissions, messageSource);
-  }
-
   @Test
   void getSchedule1_validatesContext_derivesEditFlag_andReturnsDocument() {
     Schedule1Response doc = mock(Schedule1Response.class);

backend/src/test/java/ca/bc/gov/nrs/ilcr/schedule1/Schedule1OtherCostsControllerTest.java

@@ -13,9 +13,9 @@
 import ca.bc.gov.nrs.ilcr.schedule1.dto.OtherCostsDocument;
 import ca.bc.gov.nrs.ilcr.security.SchedulePermissions;
 import java.util.Locale;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.context.MessageSource;
@@ -50,14 +50,9 @@ class Schedule1OtherCostsControllerTest {
   @Mock
   private Authentication authentication;
 
+  @InjectMocks
   private Schedule1OtherCostsController controller;
 
-  @BeforeEach
-  void setUp() {
-    controller = new Schedule1OtherCostsController(
-        millContextService, schedule1Service, permissions, messageSource);
-  }
-
   private OtherCostsDocument mockDocEchoingMessage() {
     OtherCostsDocument doc = mock(OtherCostsDocument.class);
     when(doc.withMessage(any())).thenReturn(doc);

backend/src/test/java/ca/bc/gov/nrs/ilcr/schedule1/Schedule1OtherCostsServiceTest.java

@@ -92,32 +92,32 @@ void add_inheritsSharedVolume_andPersists() {
     stubRows(new BigDecimal("6000"), List.of());
     service.addOtherCost(MILL, YEAR, new OtherCostRequest("New Row", 1200), USER);
     // BR-06: the new row inherits the shared Other-Costs volume (6000).
-    verify(repository).insertOtherCost(
-        eq(SUMMARY), eq("New Row"), eq(1200), eq(new BigDecimal("6000")), eq(USER));
+    verify(repository).insertOtherCost(SUMMARY, "New Row", 1200, new BigDecimal("6000"), USER);
   }
 
   @Test
   void add_nullCostAccepted() {
     stubContext("D");
     stubRows(new BigDecimal("6000"), List.of());
     service.addOtherCost(MILL, YEAR, new OtherCostRequest("No cost row", null), USER);
-    verify(repository).insertOtherCost(
-        eq(SUMMARY), eq("No cost row"), eq(null), eq(new BigDecimal("6000")), eq(USER));
+    verify(repository).insertOtherCost(SUMMARY, "No cost row", null, new BigDecimal("6000"), USER);
   }
 
   @Test
   void add_nonDraft_throws409() {
     stubContext("S");
+    OtherCostRequest request = new OtherCostRequest("x", 1);
     assertThrows(ScheduleNotEditableException.class,
-        () -> service.addOtherCost(MILL, YEAR, new OtherCostRequest("x", 1), USER));
+        () -> service.addOtherCost(MILL, YEAR, request, USER));
   }
 
   @Test
   void update_unknownId_throws404() {
     stubContext("D");
     when(repository.updateOtherCost(999999, SUMMARY, "x", 1, USER)).thenReturn(0);
+    OtherCostRequest request = new OtherCostRequest("x", 1);
     assertThrows(OtherCostNotFoundException.class,
-        () -> service.updateOtherCost(MILL, YEAR, 999999, new OtherCostRequest("x", 1), USER));
+        () -> service.updateOtherCost(MILL, YEAR, 999999, request, USER));
   }
 
   @Test
@@ -144,8 +144,9 @@ void add_persistenceFailure_translatesToScheduleNotSaved() {
     doThrow(new DataIntegrityViolationException("boom"))
         .when(repository).insertOtherCost(eq(SUMMARY), any(), any(), any(), eq(USER));
 
+    OtherCostRequest request = new OtherCostRequest("x", 1);
     assertThrows(ScheduleNotSavedException.class,
-        () -> service.addOtherCost(MILL, YEAR, new OtherCostRequest("x", 1), USER));
+        () -> service.addOtherCost(MILL, YEAR, request, USER));
   }
 
   @Test
@@ -169,8 +170,9 @@ void update_persistenceFailure_translatesToScheduleNotSaved() {
     when(repository.updateOtherCost(5051, SUMMARY, "x", 1, USER))
         .thenThrow(new DataIntegrityViolationException("boom"));
 
+    OtherCostRequest request = new OtherCostRequest("x", 1);
     assertThrows(ScheduleNotSavedException.class,
-        () -> service.updateOtherCost(MILL, YEAR, 5051, new OtherCostRequest("x", 1), USER));
+        () -> service.updateOtherCost(MILL, YEAR, 5051, request, USER));
   }
 
   @Test