[MODFIN-352] Fixed code smell

folio-org · Apr 10, 2024 · 1411dce · 1411dce
1 parent f454be7
commit 1411dce
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/src/main/java/org/folio/services/fiscalyear/FiscalYearApiService.java b/src/main/java/org/folio/services/fiscalyear/FiscalYearApiService.java
@@ -49,10 +49,12 @@ public Future<FiscalYear> createFiscalYear(FiscalYear fiscalYear, RequestContext
       });
   }
 
-  public Future<FiscalYearsCollection> getFiscalYearsWithAcqUnitsRestriction(String query, int offset, int limit, RequestContext requestContext) {
+  public Future<FiscalYearsCollection> getFiscalYearsWithAcqUnitsRestriction(String query, int offset, int limit,
+      RequestContext requestContext) {
     return acqUnitsService.buildAcqUnitsCqlClause(requestContext)
       .map(clause -> StringUtils.isEmpty(query) ? clause : combineCqlExpressions("and", clause, query))
-      .compose(effectiveQuery -> fiscalYearService.getFiscalYearByQuery(effectiveQuery, offset, limit, requestContext));
+      .compose(effectiveQuery -> fiscalYearService.getFiscalYearsWithoutAcqUnitsRestriction(effectiveQuery, offset,
+        limit, requestContext));
   }
 
   public Future<FiscalYear> getFiscalYearById(String id, boolean withFinancialSummary, RequestContext requestContext) {

diff --git a/src/main/java/org/folio/services/fiscalyear/FiscalYearService.java b/src/main/java/org/folio/services/fiscalyear/FiscalYearService.java
@@ -39,14 +39,6 @@ public Future<FiscalYearsCollection> getFiscalYearsWithoutAcqUnitsRestriction(St
     return restClient.get(requestEntry.buildEndpoint(), FiscalYearsCollection.class, requestContext);
   }
 
-  public Future<FiscalYearsCollection> getFiscalYearByQuery(String query, int offset, int limit, RequestContext requestContext) {
-    var requestEntry = new RequestEntry(resourcesPath(FISCAL_YEARS_STORAGE))
-        .withOffset(offset)
-        .withLimit(limit)
-        .withQuery(query);
-    return restClient.get(requestEntry.buildEndpoint(), FiscalYearsCollection.class, requestContext);
-  }
-
   public Future<FiscalYear> getFiscalYearById(String id, RequestContext requestContext) {
     return restClient.get(resourceByIdPath(FISCAL_YEARS_STORAGE, id), FiscalYear.class, requestContext);
   }