Merge branch 'master' into MODFIN-408

Author: BKadirkhodjaev

descriptors/ModuleDescriptor-template.json

@@ -350,7 +350,7 @@
             "finance-storage.budgets.collection.get",
             "finance-storage.fiscal-years.item.get",
             "finance-storage.transactions.collection.get",
-            "finance-storage.transaction-totals.collection.get",
+            "finance-storage.transaction-totals.batch.post",
             "acquisitions-units-storage.units.collection.get",
             "acquisitions-units-storage.memberships.collection.get"
           ]
@@ -372,7 +372,7 @@
             "finance-storage.budgets.collection.get",
             "finance-storage.fiscal-years.item.get",
             "finance-storage.transactions.collection.get",
-            "finance-storage.transaction-totals.collection.get",
+            "finance-storage.transaction-totals.batch.post",
             "acquisitions-units-storage.units.collection.get",
             "acquisitions-units-storage.memberships.collection.get"
           ]
@@ -840,13 +840,13 @@
           "pathPattern": "/finance/finance-data",
           "permissionsRequired": ["finance.finance-data.collection.put"],
           "modulePermissions": [
-            "finance-storage.budgets.item.get",
+            "finance-storage.budgets.batch.post",
+            "finance-storage.funds.batch.post",
             "finance-storage.finance-data.collection.put",
             "finance-storage.fund-update-logs.item.get",
             "finance-storage.fund-update-logs.item.post",
             "finance-storage.fund-update-logs.item.put",
-            "finance-storage.job-number.get",
-            "finance-storage.funds.item.get"
+            "finance-storage.job-number.get"
           ]
         }
       ]

pom.xml

@@ -35,7 +35,7 @@
 
     <!--Project properties-->
     <ramlfiles_path>${basedir}/ramls</ramlfiles_path>
-    <raml-module-builder.version>35.4.0</raml-module-builder.version>
+    <raml-module-builder.version>36.0.0-SNAPSHOT</raml-module-builder.version>
     <sonar.exclusions>**/models/*.java</sonar.exclusions>
     <sonar.test.exclusions>**/*Test.java</sonar.test.exclusions>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -44,33 +44,33 @@
     <jsonschema_paths>acq-models/mod-finance/schemas,raml-util/schemas,acq-models/common/schemas</jsonschema_paths>
 
     <!--Dependency Management Properties-->
-    <spring.version>6.2.7</spring.version>
-    <vertx.version>4.5.13</vertx.version>
-    <junit.jupiter.version>5.12.0</junit.jupiter.version>
-    <log4j.version>2.24.3</log4j.version>
+    <spring.version>7.0.2</spring.version>
+    <vertx.version>5.0.6</vertx.version>
+    <junit.jupiter.version>6.0.1</junit.jupiter.version>
+    <log4j.version>2.25.3</log4j.version>
 
     <!--Dependency properties-->
-    <mockito.version>5.15.2</mockito.version>
-    <aspectj.version>1.9.22.1</aspectj.version>
-    <rest-assured.version>5.5.1</rest-assured.version>
-    <folio-di-support.version>3.0.0</folio-di-support.version>
-    <caffeine.version>3.2.0</caffeine.version>
+    <mockito.version>5.21.0</mockito.version>
+    <aspectj.version>1.9.25.1</aspectj.version>
+    <rest-assured.version>6.0.0</rest-assured.version>
+    <folio-di-support.version>4.0.0-SNAPSHOT</folio-di-support.version>
+    <caffeine.version>3.2.3</caffeine.version>
 
     <!--Folio dependencies properties-->
-    <folio-module-descriptor-validator.version>1.0.0</folio-module-descriptor-validator.version>
+    <folio-module-descriptor-validator.version>1.0.1</folio-module-descriptor-validator.version>
 
     <!--Maven plugin properties-->
-    <aspectj-maven-plugin.version>1.14</aspectj-maven-plugin.version>
-    <exec-maven-plugin.version>3.5.0</exec-maven-plugin.version>
-    <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
-    <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
-    <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
-    <maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
+    <aspectj-maven-plugin.version>1.14.1</aspectj-maven-plugin.version>
+    <exec-maven-plugin.version>3.6.3</exec-maven-plugin.version>
+    <maven-resources-plugin.version>3.4.0</maven-resources-plugin.version>
+    <maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
+    <maven-antrun-plugin.version>3.2.0</maven-antrun-plugin.version>
+    <maven-shade-plugin.version>3.6.1</maven-shade-plugin.version>
     <properties-maven-plugin.version>1.2.1</properties-maven-plugin.version>
     <jsonschema2pojo-maven-plugin.version>1.2.2</jsonschema2pojo-maven-plugin.version>
-    <maven-release-plugin.version>3.1.1</maven-release-plugin.version>
-    <maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
-    <build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
+    <maven-release-plugin.version>3.3.1</maven-release-plugin.version>
+    <maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
+    <build-helper-maven-plugin.version>3.6.1</build-helper-maven-plugin.version>
     <copy-rename-maven-plugin.version>1.0.1</copy-rename-maven-plugin.version>
 
     <argLine />
@@ -154,7 +154,7 @@
     <dependency>
       <groupId>one.util</groupId>
       <artifactId>streamex</artifactId>
-      <version>0.8.3</version>
+      <version>0.8.4</version>
     </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
@@ -186,7 +186,7 @@
     <dependency>
       <groupId>org.javamoney</groupId>
       <artifactId>moneta</artifactId>
-      <version>1.4.4</version>
+      <version>1.4.5</version>
       <exclusions>
         <exclusion>
           <groupId>org.javamoney.moneta</groupId>

ramls/acq-models

@@ -10,6 +10,7 @@ documentation:
 
 types:
   errors: !include raml-util/schemas/errors.schema
+  batch-id-collection: !include acq-models/common/schemas/batch_id_collection.json
   fy-finance-data-collection: !include acq-models/mod-finance/schemas/fy_finance_data_collection.json
   UUID:
     type: string

ramls/finance-data.raml

@@ -13,6 +13,7 @@ types:
   transaction-collection: !include acq-models/mod-finance/schemas/transaction_collection.json
   transaction-total: !include acq-models/mod-finance/schemas/transaction_total.json
   transaction-total-collection: !include acq-models/mod-finance/schemas/transaction_total_collection.json
+  transaction-total-batch: !include acq-models/mod-finance/schemas/transaction_total_batch.json
   batch: !include acq-models/mod-finance/schemas/batch.json
   UUID:
     type: string

ramls/transaction.raml

@@ -9,8 +9,6 @@
 
 import java.util.Map;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.folio.okapi.common.WebClientFactory;
 import org.folio.rest.core.models.RequestContext;
 import org.folio.rest.exception.HttpException;
@@ -21,30 +19,16 @@
 import io.vertx.core.MultiMap;
 import io.vertx.core.Promise;
 import io.vertx.core.http.HttpMethod;
+import io.vertx.core.http.HttpResponseExpectation;
 import io.vertx.core.json.JsonObject;
 import io.vertx.ext.web.client.HttpResponse;
 import io.vertx.ext.web.client.WebClient;
 import io.vertx.ext.web.client.WebClientOptions;
-import io.vertx.ext.web.client.predicate.ErrorConverter;
-import io.vertx.ext.web.client.predicate.ResponsePredicate;
+import lombok.extern.log4j.Log4j2;
 
+@Log4j2
 public class RestClient {
 
-  private static final Logger log = LogManager.getLogger();
-  private static final ErrorConverter ERROR_CONVERTER = ErrorConverter.createFullBody(
-    result -> {
-      String errorResponse = result.response().bodyAsString();
-      if (isJsonOfType(errorResponse, Errors.class)) {
-        return new HttpException(result.response().statusCode(), mapToErrors(errorResponse));
-      }
-      else {
-        return getErrorByCode(errorResponse)
-          .map(errorCode -> new HttpException(result.response().statusCode(), errorCode))
-          .orElse(new HttpException(result.response().statusCode(), errorResponse));
-      }
-    });
-  protected static final ResponsePredicate SUCCESS_RESPONSE_PREDICATE =
-    ResponsePredicate.create(ResponsePredicate.SC_SUCCESS, ERROR_CONVERTER);
   public static final String REQUEST_MESSAGE_LOG_INFO = "Calling {} {}";
 
   public <T> Future<T> post(String endpoint, T entity, Class<T> responseType, RequestContext requestContext) {
@@ -53,8 +37,8 @@ public <T> Future<T> post(String endpoint, T entity, Class<T> responseType, Requ
     return getVertxWebClient(requestContext.context())
       .postAbs(buildAbsEndpoint(caseInsensitiveHeader, endpoint))
       .putHeaders(caseInsensitiveHeader)
-      .expect(SUCCESS_RESPONSE_PREDICATE)
       .sendJson(entity)
+      .compose(RestClient::convertHttpResponse)
       .map(HttpResponse::bodyAsJsonObject)
       .map(body -> body.mapTo(responseType))
       .onFailure(log::error);
@@ -66,8 +50,8 @@ public <T> Future<Void> postEmptyResponse(String endpoint, T entity, RequestCont
     return getVertxWebClient(requestContext.context())
       .postAbs(buildAbsEndpoint(caseInsensitiveHeader, endpoint))
       .putHeaders(caseInsensitiveHeader)
-      .expect(SUCCESS_RESPONSE_PREDICATE)
       .sendJson(entity)
+      .compose(RestClient::convertHttpResponse)
       .onFailure(log::error)
       .mapEmpty();
   }
@@ -78,8 +62,8 @@ public <REQ, RES> Future<RES> postBatch(String endpoint, REQ requestEntity, Clas
     return getVertxWebClient(requestContext.context())
       .postAbs(buildAbsEndpoint(caseInsensitiveHeader, endpoint))
       .putHeaders(caseInsensitiveHeader)
-      .expect(SUCCESS_RESPONSE_PREDICATE)
       .sendJson(requestEntity)
+      .compose(RestClient::convertHttpResponse)
       .map(HttpResponse::bodyAsJsonObject)
       .map(body -> body.mapTo(responseType))
       .onFailure(log::error);
@@ -101,8 +85,8 @@ public <T> Future<Void> put(String endpoint, T dataObject, RequestContext reques
     return getVertxWebClient(requestContext.context())
       .putAbs(buildAbsEndpoint(caseInsensitiveHeader, endpoint))
       .putHeaders(caseInsensitiveHeader)
-      .expect(SUCCESS_RESPONSE_PREDICATE)
       .sendJson(recordData)
+      .compose(RestClient::convertHttpResponse)
       .onFailure(log::error)
       .mapEmpty();
   }
@@ -116,8 +100,8 @@ public <T> Future<T> put(String endpoint, T dataObject, Class<T> responseType ,R
     return getVertxWebClient(requestContext.context())
       .putAbs(buildAbsEndpoint(caseInsensitiveHeader, endpoint))
       .putHeaders(caseInsensitiveHeader)
-      .expect(SUCCESS_RESPONSE_PREDICATE)
       .sendJson(recordData)
+      .compose(RestClient::convertHttpResponse)
       .map(HttpResponse::bodyAsJsonObject)
       .map(jsonObject -> jsonObject.mapTo(responseType))
       .onFailure(log::error);
@@ -132,8 +116,8 @@ public Future<Void> delete(String endpointById, boolean skipError404, RequestCon
     getVertxWebClient(requestContext.context())
       .deleteAbs(buildAbsEndpoint(caseInsensitiveHeader, endpointById))
       .putHeaders(caseInsensitiveHeader)
-      .expect(SUCCESS_RESPONSE_PREDICATE)
       .send()
+      .compose(RestClient::convertHttpResponse)
       .onSuccess(f -> promise.complete())
       .onFailure(t -> handleErrorResponse(promise, t, skipError404));
 
@@ -177,8 +161,8 @@ public <T> Future<T> get(String endpoint, boolean skipError404, Class<T> respons
     getVertxWebClient(requestContext.context())
       .getAbs(absEndpoint)
       .putHeaders(caseInsensitiveHeader)
-      .expect(SUCCESS_RESPONSE_PREDICATE)
       .send()
+      .compose(RestClient::convertHttpResponse)
       .map(HttpResponse::bodyAsJsonObject)
       .map(jsonObject -> jsonObject.mapTo(responseType))
       .onSuccess(promise::complete)
@@ -187,20 +171,35 @@ public <T> Future<T> get(String endpoint, boolean skipError404, Class<T> respons
     return promise.future();
   }
 
-  protected WebClient getVertxWebClient(Context context) {
+  private static WebClient getVertxWebClient(Context context) {
     WebClientOptions options = new WebClientOptions();
     options.setLogActivity(true);
     options.setKeepAlive(true);
     options.setConnectTimeout(2000);
     options.setIdleTimeout(5000);
-    options.setTryUseCompression(true);
-
+    options.setDecompressionSupported(true);
     return WebClientFactory.getWebClient(context.owner(), options);
   }
 
-  protected String buildAbsEndpoint(MultiMap okapiHeaders, String endpoint) {
+  private static String buildAbsEndpoint(MultiMap okapiHeaders, String endpoint) {
     var okapiURL = okapiHeaders.get(OKAPI_URL);
     return okapiURL + endpoint;
   }
 
+  private static <T> Future<HttpResponse<T>> convertHttpResponse(HttpResponse<T> response) {
+    if (HttpResponseExpectation.SC_SUCCESS.test(response)) {
+      return Future.succeededFuture(response);
+    }
+    HttpException exception;
+    var errorResponse = response.bodyAsString();
+    if (isJsonOfType(errorResponse, Errors.class)) {
+      exception = new HttpException(response.statusCode(), mapToErrors(errorResponse));
+    } else {
+      exception = getErrorByCode(errorResponse)
+        .map(errorCode -> new HttpException(response.statusCode(), errorCode))
+        .orElse(new HttpException(response.statusCode(), errorResponse));
+    }
+    return Future.failedFuture(exception);
+  }
+
 }

src/main/java/org/folio/rest/core/RestClient.java

@@ -20,7 +20,6 @@
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.folio.okapi.common.GenericCompositeFuture;
 import org.folio.rest.core.RestClient;
 import org.folio.rest.core.models.RequestContext;
 import org.folio.rest.exception.HttpException;
@@ -113,7 +112,7 @@ private Future<Void> assignFundToGroups(CompositeFund compositeFund, String fisc
     var futures = groupFundFiscalYears.stream()
       .map(groupFundFiscalYear -> groupFundFiscalYearService.createGroupFundFiscalYear(groupFundFiscalYear, new RequestContext(ctx, okapiHeaders)))
       .collect(Collectors.toList());
-    return GenericCompositeFuture.join(futures)
+    return Future.join(futures)
       .mapEmpty();
   }
 
@@ -148,15 +147,15 @@ private Future<Void> assignFundToGroups(List<GroupFundFiscalYear> groupFundFisca
       .map(groupFundFiscalYear -> groupFundFiscalYearService.createGroupFundFiscalYear(groupFundFiscalYear, new RequestContext(ctx, okapiHeaders)))
       .collect(Collectors.toList());
 
-    return GenericCompositeFuture.join(futures)
+    return Future.join(futures)
       .mapEmpty();
   }
 
   private Future<Void> unassignGroupsForFund(Collection<String> groupFundFiscalYearIds) {
     var futures = groupFundFiscalYearIds.stream()
       .map(id -> groupFundFiscalYearService.deleteGroupFundFiscalYear(id, new RequestContext(ctx, okapiHeaders)))
       .collect(Collectors.toList());
-    return GenericCompositeFuture.join(futures)
+    return Future.join(futures)
       .mapEmpty();
   }
 

src/main/java/org/folio/rest/helper/FundsHelper.java

@@ -22,20 +22,18 @@ public class InitAPIs implements InitAPI {
 
   @Override
   public void init(Vertx vertx, Context context, Handler<AsyncResult<Boolean>> resultHandler) {
-    vertx.executeBlocking(
-      promise -> {
-        initJavaMoney();
-        SpringContextUtil.init(vertx, context, ApplicationConfig.class);
-        promise.complete();
-      },
-      result -> {
-        if (result.succeeded()) {
-          resultHandler.handle(Future.succeededFuture(true));
-        } else {
-          logger.error("Failure to init API", result.cause());
-          resultHandler.handle(Future.failedFuture(result.cause()));
-        }
-      });
+    vertx.executeBlocking(() -> {
+      initJavaMoney();
+      SpringContextUtil.init(vertx, context, ApplicationConfig.class);
+      return true;
+    }).onComplete(result -> {
+      if (result.succeeded()) {
+        resultHandler.handle(Future.succeededFuture(true));
+      } else {
+        logger.error("Failure to init API", result.cause());
+        resultHandler.handle(Future.failedFuture(result.cause()));
+      }
+    });
   }
 
   private void initJavaMoney() {

src/main/java/org/folio/rest/impl/InitAPIs.java

@@ -7,19 +7,17 @@
 import org.folio.rest.jaxrs.model.BudgetExpenseClass;
 import org.folio.rest.jaxrs.model.SharedBudget;
 import org.folio.rest.jaxrs.model.StatusExpenseClass;
-import org.folio.rest.jaxrs.model.Transaction.TransactionType;
+import org.folio.rest.jaxrs.model.Transaction;
+import org.folio.rest.jaxrs.model.TransactionType;
 
 import io.vertx.core.json.JsonObject;
-import org.folio.rest.jaxrs.model.TransactionTotal;
+import lombok.experimental.UtilityClass;
 
+@UtilityClass
 public final class BudgetUtils {
 
-  public static final List<TransactionType> TRANSFER_TRANSACTION_TYPES = List.of(TransactionType.TRANSFER, TransactionType.ROLLOVER_TRANSFER);
-  public static final List<TransactionTotal.TransactionType> TRANSFER_TRANSACTION_TOTAL_TYPES = List.of(TransactionTotal.TransactionType.TRANSFER, TransactionTotal.TransactionType.ROLLOVER_TRANSFER);
-
-  private BudgetUtils() {
-
-  }
+  public static final List<Transaction.TransactionType> TRANSFER_TRANSACTION_TYPES = List.of(Transaction.TransactionType.TRANSFER, Transaction.TransactionType.ROLLOVER_TRANSFER);
+  public static final List<TransactionType> TRANSFER_TRANSACTION_TOTAL_TYPES = List.of(TransactionType.TRANSFER, TransactionType.ROLLOVER_TRANSFER);
 
   public static SharedBudget buildSharedBudget(Budget budget, List<BudgetExpenseClass> budgetExpenseClasses) {
     List<StatusExpenseClass> statusExpenseClasses = budgetExpenseClasses.stream()
@@ -33,7 +31,7 @@ public static SharedBudget convertToSharedBudget(Budget budget) {
   }
 
   public static Budget convertToBudget(SharedBudget budget) {
-    JsonObject jsonSharedBudget =  JsonObject.mapFrom(budget);
+    JsonObject jsonSharedBudget = JsonObject.mapFrom(budget);
     jsonSharedBudget.remove("statusExpenseClasses");
     return jsonSharedBudget.mapTo(Budget.class);
   }