Skip to content

Commit

Permalink
CIRCSTORE-494 Upgrade to RMB 35.2.0, Vertx 4.5.5, Spring 6.1.5 (#454)
Browse files Browse the repository at this point in the history
* CIRCSTORE-494 Upgrade to RMB 35.2.0, Vertx 4.5.5

* CIRCSTORE-494 Fix test, upgrade Spring to v6.1.5

* CIRCSTORE-494 Remove unneeded space
  • Loading branch information
alexanderkurash authored Mar 18, 2024
1 parent 700abfb commit 5390275
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<ramlfiles_path>${basedir}/ramls</ramlfiles_path>
<vertx-version>4.4.6</vertx-version>
<raml-module-builder-version>35.1.0</raml-module-builder-version>
<spring.version>5.3.23</spring.version>
<vertx-version>4.5.5</vertx-version>
<raml-module-builder-version>35.2.0</raml-module-builder-version>
<spring.version>6.1.5</spring.version>
<argLine />
</properties>

Expand Down
10 changes: 7 additions & 3 deletions src/main/java/org/folio/rest/impl/AnonymizeStorageLoansAPI.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@
import static io.vertx.core.Future.succeededFuture;
import static org.folio.support.ModuleConstants.LOAN_HISTORY_TABLE;
import static org.folio.support.ModuleConstants.MODULE_NAME;

import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import javax.validation.constraints.NotNull;

import javax.ws.rs.core.Response;

import org.apache.commons.collections4.CollectionUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.folio.rest.annotations.Validate;
import org.folio.rest.jaxrs.model.AnonymizeStorageLoansRequest;
import org.folio.rest.jaxrs.model.AnonymizeStorageLoansResponse;
Expand All @@ -21,15 +25,15 @@
import org.folio.rest.tools.utils.TenantTool;
import org.folio.rest.tools.utils.ValidationHelper;
import org.folio.support.UUIDValidation;

import io.vertx.core.AsyncResult;
import io.vertx.core.Context;
import io.vertx.core.Future;
import io.vertx.core.Handler;
import io.vertx.core.Promise;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import io.vertx.sqlclient.Row;
import io.vertx.sqlclient.RowSet;
import jakarta.validation.constraints.NotNull;

public class AnonymizeStorageLoansAPI implements AnonymizeStorageLoans {
private static final Logger log = LogManager.getLogger();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/folio/service/loan/LoanService.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import java.util.StringJoiner;
import java.util.function.Function;

import javax.validation.constraints.NotNull;
import javax.ws.rs.core.Response;

import org.apache.commons.lang3.StringUtils;
Expand Down Expand Up @@ -51,6 +50,7 @@
import io.vertx.core.Context;
import io.vertx.core.Future;
import io.vertx.core.Promise;
import jakarta.validation.constraints.NotNull;

public class LoanService {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ public void processingShouldFailWhenConfigurationIsInvalid()
throws MalformedURLException, ExecutionException, InterruptedException, TimeoutException {

stubWithInvalidTlrSettings();
checkFailedTlrFeatureToggleJob("Invalid configurations response");
checkFailedTlrFeatureToggleJob("Unrecognized token");
}

@Test
Expand Down

0 comments on commit 5390275

Please sign in to comment.