Skip to content

Commit a231ff5

Browse files
committed
fix more sonar issues
1 parent c13bc02 commit a231ff5

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

server/wfprev-api/src/main/java/ca/bc/gov/nrs/wfprev/services/ProjectLocationService.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ void addFiscalAttributeFilters(CriteriaBuilder cb, Root<ProjectEntity> project,
115115
Subquery<UUID> sq = cb.createQuery().subquery(UUID.class);
116116
Root<ProjectFiscalEntity> fiscal = sq.from(ProjectFiscalEntity.class);
117117

118-
List<Predicate> pf = new ArrayList<>();
119-
pf.add(cb.equal(fiscal.get(PROJECT).get(PROJECT_GUID), project.get(PROJECT_GUID)));
118+
List<Predicate> predicateList = new ArrayList<>();
119+
predicateList.add(cb.equal(fiscal.get(PROJECT).get(PROJECT_GUID), project.get(PROJECT_GUID)));
120120

121121
// fiscalYear
122122
if (notEmpty(params.getFiscalYears())) {
@@ -129,21 +129,21 @@ void addFiscalAttributeFilters(CriteriaBuilder cb, Root<ProjectEntity> project,
129129
years.add(cb.like(fyPath.as(String.class), year + "%"));
130130
}
131131
}
132-
pf.add(cb.or(years.toArray(new Predicate[0])));
132+
predicateList.add(cb.or(years.toArray(new Predicate[0])));
133133
}
134134

135135
// activityCategoryCode
136136
if (notEmpty(params.getActivityCategoryCodes())) {
137-
pf.add(fiscal.get("activityCategoryCode").in(params.getActivityCategoryCodes()));
137+
predicateList.add(fiscal.get("activityCategoryCode").in(params.getActivityCategoryCodes()));
138138
}
139139

140140
// planFiscalStatusCode (nested path only if present)
141141
if (notEmpty(params.getPlanFiscalStatusCodes())) {
142142
Path<String> statusCode = fiscal.get("planFiscalStatusCode").get("planFiscalStatusCode");
143-
pf.add(statusCode.in(params.getPlanFiscalStatusCodes()));
143+
predicateList.add(statusCode.in(params.getPlanFiscalStatusCodes()));
144144
}
145145

146-
sq.select(fiscal.get(PROJECT).get(PROJECT_GUID)).where(cb.and(pf.toArray(new Predicate[0])));
146+
sq.select(fiscal.get(PROJECT).get(PROJECT_GUID)).where(cb.and(predicateList.toArray(new Predicate[0])));
147147
predicates.add(cb.exists(sq));
148148
}
149149

server/wfprev-api/src/test/java/ca/bc/gov/nrs/wfprev/ProjectLocationControllerTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ void setup() {
6060
@Test
6161
@WithMockUser
6262
void testGetAllProjectLocations_Empty() throws Exception {
63-
List<ProjectLocationModel> list = Collections.emptyList();
6463
when(projectLocationService.getAllProjectLocations(any(FeatureQueryParams.class)))
6564
.thenReturn(CollectionModel.of(Collections.emptyList()));
6665

0 commit comments

Comments
 (0)